格式调整

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

@@ -61,8 +61,9 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     List<Integer> ClubsIds(ClubChangeSp clubChangeSp);
 
-    void oldname(@Param("oldserviceProviderId")Integer oldserviceProviderId,@Param("clubID")Integer clubID,@Param("oldSpID")Integer oldSpID,@Param("newSpID")Integer newSpID);
-    void oldnames(@Param("clubID")Integer clubID,@Param("oldSpID")Integer oldSpID,@Param("newSpID")Integer newSpID);
+    void oldname(@Param("oldserviceProviderId") Integer oldserviceProviderId, @Param("clubID") Integer clubID, @Param("oldSpID") Integer oldSpID, @Param("newSpID") Integer newSpID);
+
+    void oldnames(@Param("clubID") Integer clubID, @Param("oldSpID") Integer oldSpID, @Param("newSpID") Integer newSpID);
 
     List<CmReport> ReportList(CmReport cmReport);
 
@@ -72,7 +73,7 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     Integer clubRemarksConut(Integer reportID);
 
-    void updateAuditRemarks(@Param("reportID")Integer reportID,@Param("auditName")String auditName,@Param("auditText")String auditText,@Param("status")Integer status);
+    void updateAuditRemarks(@Param("reportID") Integer reportID, @Param("auditName") String auditName, @Param("auditText") String auditText, @Param("status") Integer status);
 
     void updateClubRemarks(Integer remarksId);
 
@@ -80,7 +81,7 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     void deleteClubRemarks(Integer reportID);
 
-    void addRecordLinkage(@Param("describe")String describe,@Param("link")String link,@Param("clubId")Integer clubId);
+    void addRecordLinkage(@Param("describe") String describe, @Param("link") String link, @Param("clubId") Integer clubId);
 
     String recordLinkage(Integer clubId);
 

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

@@ -201,7 +201,6 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
 
     @Transactional(readOnly = false)
     public void oldnames(Integer clubID, Integer oldSpID, Integer newSpID) {
-
         newCmClubDao.oldnames(clubID, oldSpID, newSpID);
     }
 

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

@@ -95,7 +95,6 @@
           AND delType = 1
     </select>
 
-
     <select id="findList" resultType="NewCmClub">
         SELECT
         <include refid="newCmClubColumns"/>
@@ -180,6 +179,7 @@
             </otherwise>
         </choose>
     </select>
+
     <select id="spNameList" resultType="com.caimei.modules.project.model.ServiceProviderModel">
         SELECT serviceProviderID, name
         FROM serviceprovider
@@ -187,6 +187,7 @@
           AND validFlag = 1
           AND STATUS = 90
     </select>
+
     <select id="findAllList" resultType="NewCmClub">
         SELECT
         <include refid="newCmClubColumns"/>
@@ -429,6 +430,7 @@
         where serviceProviderID = #{spID}
           and status = 90
     </select>
+
     <select id="findRemarksList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
         select DISTINCT ccr.id                                                                        as remarksId,
                         ccr.remarks,
@@ -449,12 +451,14 @@
         where clubId = #{clubId}
         order by addTime desc
     </select>
+
     <select id="getRemarksImageList" resultType="java.lang.String">
         select imageUrl
         from cm_club_remarks_file
         where remarksId = #{remarksId}
           and fileType = 1
     </select>
+
     <select id="getRemarksFileList" resultType="com.caimei.modules.user.entity.RemarksFileVo">
         select fileName, ossName
         from cm_club_remarks_file
@@ -483,6 +487,7 @@
           and type = 2
           and num = 500
     </select>
+
     <select id="findRegistList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
         SELECT DISTINCT
         ccr.id AS remarksId, ccr.remarks,s.linkman AS spName, ccr.addTime,ccr.questionMan,
@@ -540,17 +545,20 @@
             </when>
         </choose>
     </select>
+
     <select id="findConsults" resultType="com.caimei.modules.consult.entity.type.CmConsulttype">
         select id, className, createdTime
         from cm_consulttype
         where delflag = 0
     </select>
+
     <select id="findTeams" resultType="com.caimei.modules.user.entity.CmSaleMan">
         select csr.leaderId, s.name as leaderName
         from cm_serviceteam_role csr
                  left join serviceprovider s on s.serviceProviderID = csr.leaderId
         where csr.delflag = 0
     </select>
+
     <select id="findGroup" resultType="com.caimei.modules.project.model.ServiceProviderModel">
         SELECT serviceId as serviceProviderID, s.name
         FROM cm_serviceteam_group csg
@@ -558,6 +566,7 @@
                  LEFT JOIN serviceprovider s ON s.serviceProviderID = csg.serviceId
         WHERE csr.leaderId = #{leaderId}
     </select>
+
     <select id="findClassName" resultType="java.lang.String">
         select className
         from cm_consulttype
@@ -592,13 +601,8 @@
         WHERE clubId = #{clubID}
     </select>
 
-    <!--    <insert id="oldname">-->
-    <!--        INSERT INTO `cm_old_remarks`(serviceProviderId, `serviceProviderName`)-->
-    <!--        VALUES (#{serviceProviderId}, #{serviceProviderName})-->
-    <!--    </insert>-->
-
     <update id="oldname">
-        UPDATE `cm_club_remarks`
+        UPDATE cm_club_remarks
         SET oldserviceProviderId = #{oldserviceProviderId},
             serviceProviderId=#{newSpID}
         WHERE clubId = #{clubID}
@@ -606,7 +610,7 @@
     </update>
 
     <update id="oldnames">
-        UPDATE `cm_club_remarks`
+        UPDATE cm_club_remarks
         SET serviceProviderId=#{newSpID}
         WHERE clubId = #{clubID}
           AND serviceProviderId = #{oldSpID}
@@ -972,6 +976,7 @@
             </if>
         </if>
     </select>
+
     <select id="selPageLable" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">
         SELECT c.userID, COUNT(pageType) AS number, cbr.pageLabel
         FROM club c
@@ -980,6 +985,7 @@
           AND cbr.pageType in (8, 9)
         GROUP BY c.userID, cbr.pageLabel
     </select>
+
     <select id="findExcelList" resultType="com.caimei.modules.user.entity.easyExcel">
         SELECT
         u.userId,