活动 日期修改

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/project/add.html

@@ -42,16 +42,14 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">开始时间：</label>
-            <div class="col-sm-8">
-                <input name="timeStart" class="form-control" type="date" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">结束时间：</label>
-            <div class="col-sm-8">
-                <input name="timeEnd" class="form-control" type="date" required>
-            </div>
+            <label class="col-sm-3 control-label is-required">活动时间： </label>
+            <input type="text" style="width: 200px;float: left"
+                   class="form-control" id="startTime" placeholder="开始时间选择" name="timeStart"
+                   required/>
+            <span class="control-label" style="float: left;margin-left: 10px;margin-right: 10px"> — </span>
+            <input type="text" style="width: 200px;float: left"
+                   class="form-control" id="endTime" placeholder="结束时间选择" name="timeEnd"
+                   required/>
         </div>
     </form>
 
@@ -103,6 +101,14 @@
     $("#form-team-add").validate({
         focusCleanup: true
     });
+    $("#startTime").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
+    $("#endTime").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
 
     $("input:checkbox").click(function () {
         var domName = $(this).attr('name');//获取当前单选框控件name 属性值
@@ -161,9 +167,9 @@
     })
 
     function submitHandler() {
-        if(teamIds.length===0){
+        if (teamIds.length === 0) {
             alert("未选择职责组");
-        }else {
+        } else {
             document.getElementById("teamIdArray").value = teamIds.join(",");
             if ($.validate.form()) {
                 $.operate.save(smilePrefix + "/project/insert", $('#form-team-add').serialize());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/project/edit.html

@@ -45,19 +45,29 @@
                        required>
             </div>
         </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label is-required">开始时间：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="timeStart" class="form-control" type="date" th:value="${smileProjectDetailsVo.timeStart}"-->
+<!--                       required>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label is-required">结束时间：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="timeEnd" class="form-control" type="date" th:value="${smileProjectDetailsVo.timeEnd}"-->
+<!--                       required>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">开始时间：</label>
-            <div class="col-sm-8">
-                <input name="timeStart" class="form-control" type="date" th:value="${smileProjectDetailsVo.timeStart}"
-                       required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">结束时间：</label>
-            <div class="col-sm-8">
-                <input name="timeEnd" class="form-control" type="date" th:value="${smileProjectDetailsVo.timeEnd}"
-                       required>
-            </div>
+            <label class="col-sm-3 control-label is-required">活动时间： </label>
+            <input th:field="${smileProjectDetailsVo.timeStart}" type="text" style="width: 200px;float: left"
+                   class="form-control" id="startTime" placeholder="开始时间选择" name="timeStart"
+                   required/>
+            <span class="control-label" style="float: left;margin-left: 10px;margin-right: 10px"> — </span>
+            <input th:field="${smileProjectDetailsVo.timeEnd}" type="text" style="width: 200px;float: left"
+                   class="form-control" id="endTime" placeholder="结束时间选择" name="timeEnd"
+                   required/>
         </div>
     </form>
 
@@ -112,6 +122,15 @@
         focusCleanup: true
     });
 
+    $("#startTime").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
+    $("#endTime").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
+
     $("input:checkbox").click(function () {
         var domName = $(this).attr('name');//获取当前单选框控件name 属性值
         var checkedState = $(this).attr('checked');//记录当前选中状态

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersProjectServiceImpl.java

@@ -145,8 +145,8 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
         SmileVolunteersProject smileVolunteersProject = SmileVolunteersProject.getNew();
         smileVolunteersProject.setProjectId(source.getProjectId());
         smileVolunteersProject.setTitle(source.getTitle());
-        smileVolunteersProject.setTimeStart(LocalDateTime.parse(source.getTimeStart() + " 00:00:00", DTF_YMD_HMS));
-        smileVolunteersProject.setTimeEnd(LocalDateTime.parse(source.getTimeEnd() + " 00:00:00", DTF_YMD_HMS));
+        smileVolunteersProject.setTimeStart(LocalDateTime.parse(source.getTimeStart(), DTF_YMD_HMS));
+        smileVolunteersProject.setTimeEnd(LocalDateTime.parse(source.getTimeEnd(), DTF_YMD_HMS));
         smileVolunteersProject.setAddress(source.getAddress());
         smileVolunteersProject.setIntroduce(source.getIntroduce());
         smileVolunteersProject.setImg(source.getImg());