bugfix

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

@@ -77,11 +77,11 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date addTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startAddTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date endAddTime;
+    private String startAddTime;
+
+
+    private String endAddTime;
     /**
      * 咨询人
      */
@@ -104,19 +104,19 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
         this.consultType = consultType;
     }
 
-    public Date getStartAddTime() {
+    public String getStartAddTime() {
         return startAddTime;
     }
 
-    public void setStartAddTime(Date startAddTime) {
+    public void setStartAddTime(String startAddTime) {
         this.startAddTime = startAddTime;
     }
 
-    public Date getEndAddTime() {
+    public String getEndAddTime() {
         return endAddTime;
     }
 
-    public void setEndAddTime(Date endAddTime) {
+    public void setEndAddTime(String endAddTime) {
         this.endAddTime = endAddTime;
     }
 

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

@@ -57,11 +57,9 @@ public class VisitRemarkVo extends DataEntity<VisitRemarkVo> {
      */
     private String leaderName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startAddTime;
+    private String startAddTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date endAddTime;
+    private String endAddTime;
     /**
      * 备注/关键词
      */
@@ -149,19 +147,19 @@ public class VisitRemarkVo extends DataEntity<VisitRemarkVo> {
         this.leaderName = leaderName;
     }
 
-    public Date getStartAddTime() {
+    public String getStartAddTime() {
         return startAddTime;
     }
 
-    public void setStartAddTime(Date startAddTime) {
+    public void setStartAddTime(String startAddTime) {
         this.startAddTime = startAddTime;
     }
 
-    public Date getEndAddTime() {
+    public String getEndAddTime() {
         return endAddTime;
     }
 
-    public void setEndAddTime(Date endAddTime) {
+    public void setEndAddTime(String endAddTime) {
         this.endAddTime = endAddTime;
     }
 

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

@@ -709,22 +709,15 @@ public class AgencyController extends BaseController {
      */
     @RequestMapping("regist")
     public String registList(CmClubRemarks cmClubRemarks, HttpServletRequest request, HttpServletResponse response, Model model) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            if(null!=cmClubRemarks.getStartAddTime()){
-                Date startAddTime = cmClubRemarks.getStartAddTime();
-                String start = format.format(startAddTime);
-                start+="00:00:00";
-                cmClubRemarks.setStartAddTime(format.parse(start));
-            }
-            if(null!=cmClubRemarks.getEndAddTime()){
-                Date endAddTime = cmClubRemarks.getEndAddTime();
-                String end=format.format(endAddTime);
-                end+="23:59:59";
-                cmClubRemarks.setEndAddTime(format.parse(end));
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(cmClubRemarks.getStartAddTime())) {
+            String startAddTime = cmClubRemarks.getStartAddTime();
+            startAddTime += " 00:00:00";
+            cmClubRemarks.setStartAddTime(startAddTime);
+        }
+        if (org.apache.commons.lang.StringUtils.isNotBlank(cmClubRemarks.getEndAddTime())) {
+            String endAddTime = cmClubRemarks.getEndAddTime();
+            endAddTime += " 23:59:59";
+            cmClubRemarks.setEndAddTime(endAddTime);
         }
         Page<CmClubRemarks> page = newCmClubService.findRegistPage(new Page<CmClubRemarks>(request, response, 20), cmClubRemarks);
         cmClubRemarks.setConsults(newCmClubService.findConsults());

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

@@ -78,23 +78,23 @@ public class VisitRemarkController extends BaseController {
         Page<VisitRemarkVo> page = visitRemarkService.findPage(new Page<VisitRemarkVo>(request, response, 20), visit);
         visit.setPage(page);
         List<VisitRemarkVo> remarksList = visitRemarkDao.findRemarksList(visit);
-        remarksList.forEach(remarks->{
+        remarksList.forEach(remarks -> {
             if (StringUtils.isNotBlank(remarks.getConsult())) {
                 StringBuilder cons = new StringBuilder();
-                if(remarks.getConsult().contains(",")){
+                if (remarks.getConsult().contains(",")) {
                     String[] split = remarks.getConsult().split(",");
                     for (String string : split) {
                         cons.append(visitRemarkDao.findClassName(string)).append(",");
                     }
                     cons = new StringBuilder(cons.substring(0, cons.length() - 1));
-                }else{
+                } else {
                     cons = new StringBuilder(visitRemarkDao.findClassName(remarks.getConsult()));
                 }
                 remarks.setConsultType(cons.toString());
             }
             List<String> imageList = visitRemarkDao.getRemarksImageList(remarks.getRemarksId());
             List<RemarksFileVo> fileList = visitRemarkDao.getRemarksFileList(remarks.getRemarksId());
-            fileList.forEach(f->f.setFileUrl(OSSUtils.getOssUrl(f.getOssName())));
+            fileList.forEach(f -> f.setFileUrl(OSSUtils.getOssUrl(f.getOssName())));
             remarks.setImageList(imageList);
             remarks.setFileList(fileList);
         });
@@ -110,22 +110,15 @@ public class VisitRemarkController extends BaseController {
      */
     @RequestMapping("unregist")
     public String unregist(VisitRemarkVo visit, HttpServletRequest request, HttpServletResponse response, Model model) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            if(null!=visit.getStartAddTime()){
-                Date startAddTime = visit.getStartAddTime();
-                String start = format.format(startAddTime);
-                start+="00:00:00";
-                visit.setStartAddTime(format.parse(start));
-            }
-            if(null!=visit.getEndAddTime()){
-                Date endAddTime = visit.getEndAddTime();
-                String end=format.format(endAddTime);
-                end+="23:59:59";
-                visit.setEndAddTime(format.parse(end));
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
+        if (org.apache.commons.lang.StringUtils.isNotBlank(visit.getStartAddTime())) {
+            String startAddTime = visit.getStartAddTime();
+            startAddTime += " 00:00:00";
+            visit.setStartAddTime(startAddTime);
+        }
+        if (org.apache.commons.lang.StringUtils.isNotBlank(visit.getEndAddTime())) {
+            String endAddTime = visit.getEndAddTime();
+            endAddTime += " 23:59:59";
+            visit.setEndAddTime(endAddTime);
         }
         Page<VisitRemarkVo> page = visitRemarkService.findUnregistPage(new Page<VisitRemarkVo>(request, response, 20), visit);
         visit.setConsults(newCmClubService.findConsults());

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

@@ -466,10 +466,10 @@
 			<if test="serviceProviderId != null">
 				and csg.serviceId = #{serviceProviderId}
 			</if>
-			<if test="startAddTime != null">
+			<if test="startAddTime != null and startAddTime != ''">
 				and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
 			</if>
-			<if test="endAddTime != null">
+			<if test="endAddTime != null and endAddTime != ''">
 				and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
 			</if>
 		</where>

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

@@ -82,10 +82,10 @@
             <if test="serviceProviderId != null">
                 and csg.serviceId = #{serviceProviderId}
             </if>
-            <if test="startAddTime != null">
+            <if test="startAddTime != '' and startAddTime != null">
                 and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
             </if>
-            <if test="endAddTime != null">
+            <if test="endAddTime != '' and endAddTime != null">
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
         </where>