修改 admin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileVolunteersController.java

@@ -213,11 +213,8 @@ public class SmileVolunteersController extends BaseController {
     public String detailsVolunteers(@PathVariable("mid")String mid, ModelMap mmap) {
         SmileVolunteersDetailsVo data = volunteersService.details(mid);
         mmap.put("smileVolunteersDetailsVo", data);
-        SmileVTSParam param = new SmileVTSParam();
-        param.setPageNum(1);
-        param.setPageSize(40);
-        TableDataInfo tableDataInfo = volunteersTeamService.list(param);
-        List<SmileVolunteersTeam> list = (List<SmileVolunteersTeam>) tableDataInfo.getRows();
+        AjaxResult ajaxResult = volunteersTeamService.getListByProjectId(data.getProjectId());
+        List<SmileVolunteersTeam> list = ((List<SmileVolunteersTeam>) ajaxResult.get("value"));
         mmap.put("listData", list);
         return prefix + "/edit";
     }

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

@@ -45,20 +45,20 @@
                        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>-->
+        <!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">活动时间： </label>
             <input th:field="${smileProjectDetailsVo.timeStart}" type="text" style="width: 200px;float: left"
@@ -131,6 +131,15 @@
         autoclose: true
     });
 
+    $(function () {
+        var data = [[${smileProjectDetailsVo.teamVoArray}]]
+        for (var i = 0; i < data.length; i++) {
+            if(data[i].isCheck===1){
+                teamIds.push(data[i].teamId);
+            }
+        }
+    });
+
     $("input:checkbox").click(function () {
         var domName = $(this).attr('name');//获取当前单选框控件name 属性值
         var checkedState = $(this).attr('checked');//记录当前选中状态
@@ -188,9 +197,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/update", $('#form-project-edit').serialize());

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

@@ -70,7 +70,7 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
         wrappers.eq(SmileVolunteersProject::getTitle, param.getTitle());
         List<SmileVolunteersProject> dataList = volunteersProjectMapper.selectList(wrappers);
         if (dataList.size() > 0) {
-            AjaxResult.error("活动名称重复");
+            return AjaxResult.error("活动名称重复");
         }
         param.setProjectId(IDGenerator.nextTimeId2());
         LocalDateTime now = LocalDateTime.now();