(咨询报备)日常更新

src/main/java/com/caimei/modules/sys/web/NotificationController.java

@@ -282,8 +282,8 @@ if(count<=0){
         notificationDao.hides();
         return "redirect:"+Global.getAdminPath()+"/sys/Notification/list";
     }
-//    @Scheduled(cron = "0 0 11 * * ?")
-@Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0 11 * * ?")
+//@Scheduled(cron = "0 0/1 * * * ?")
     public void nottime(){
         logger.info("》》》》》》》》》》》开始检测商品资质证书和上架费是否过期");
 

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

@@ -68,7 +68,7 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     Integer clubRemarksConut(Integer reportID);
 
-    void updateAuditRemarks(@Param("reportID")Integer reportID,@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);
 

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

@@ -1248,13 +1248,15 @@ private VisitRemarkDao visitRemarkDao;
     }
     @ResponseBody
     @RequestMapping("ReportCount")
-    public Map<String, Object> ReportCount(Integer reportId,String auditText,Integer status,Model model) {
+    public Map<String, Object> ReportCount(Integer reportId,String auditName,String auditText,Integer status,Model model) {
         Map<String, Object> map = new HashedMap();
        Integer clubCount= newCmClubDao.clubRemarksConut(reportId);
         Integer visitorCount=newCmClubDao.visitorRemarksConut(reportId);
+        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+        auditName=principal.getName();
          if((clubCount+=visitorCount)>0){
              map.put("success", false);
-             newCmClubDao.updateAuditRemarks(reportId,auditText,status);
+             newCmClubDao.updateAuditRemarks(reportId,auditName,auditText,status);
              System.out.println(">>>>>>>>"+(clubCount+=visitorCount));
          }else {
              System.out.println(">>>>>>>>"+(clubCount+=visitorCount));

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

@@ -609,8 +609,8 @@
             <if test="endAddTime != null and endAddTime != ''">
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
-
         </where>
+        ORDER BY ccr.`addTime` DESC
     </select>
 
     <select id="findRegistLists" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
@@ -667,7 +667,7 @@
     </select>
 
 <update id="updateAuditRemarks">
-    UPDATE cm_club_report SET status=#{status}, auditText=#{auditText},auditTime=now() WHERE id=#{reportID}
+    UPDATE cm_club_report SET status=#{status},auditName=#{auditName},auditText=#{auditText},auditTime=now() WHERE id=#{reportID}
 </update>
 
     <update id="updateClubRemarks">

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

@@ -208,8 +208,8 @@
                              height="50"></td>
                     <td>${clubRemarks.proName}</td>
                     <td>${clubRemarks.reportText}</td>
-                    <td><c:if test="${clubRemarks.reportStatus eq 1}">已审核</c:if>
-                        <c:if test="${clubRemarks.reportStatus eq 2}">待审核</c:if>
+                    <td><c:if test="${clubRemarks.reportStatus eq 1}">待审核</c:if>
+                        <c:if test="${clubRemarks.reportStatus eq 2}">已审核</c:if>
                         <c:if test="${clubRemarks.reportStatus eq 3}">审核未通过</c:if>
                     </td>
                     <td>${clubRemarks.auditName}</td>