添加机构扩展信息,修改作息

soc-modules/soc-modules-gen/src/main/resources/vm/java/domain.java.vm

@@ -52,7 +52,7 @@ private static final long serialVersionUID=1L;
             #if($parentheseIndex != -1)
             @ApiModelProperty(value = "${comment}" , notes = "$column.readConverterExp()")
             #elseif($column.javaType == 'Date')
-            @JsonFormat(pattern = "yyyy-MM-dd")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
             @ApiModelProperty(value = "${comment}")
             #else
             @ApiModelProperty(value = "${comment}")

soc-modules/soc-modules-gen/src/main/resources/vm/java/sub-domain.java.vm

@@ -43,7 +43,7 @@ private static final long serialVersionUID=1L;
             #if($parentheseIndex != -1)
             @ApiModelProperty(value = "${comment}" , notes = "$column.readConverterExp()")
             #elseif($column.javaType == 'Date')
-            @JsonFormat(pattern = "yyyy-MM-dd")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
             @ApiModelProperty(value = "${comment}")
             #else
             @ApiModelProperty(value = "${comment}")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgExtendController.java

@@ -59,7 +59,15 @@ public class SysOrgExtendController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(sysOrgExtendService.selectSysOrgExtendById(id));
     }
-
+    /**
+     * 获取机构扩展详细信息
+     */
+    @ApiOperation(value = "获取SysOrgExtend详细信息")
+    @RequiresPermissions("system:extend:query")
+    @GetMapping(value = "/org/{id}")
+    public AjaxResult getInfoByOrgId(@PathVariable("id") Long id) {
+        return success(sysOrgExtendService.selectSysOrgExtendByOrgId(id));
+    }
     /**
      * 新增机构扩展
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeSetController.java

@@ -59,7 +59,7 @@ public class SysWorkTimeSetController extends BaseController {
     @GetMapping("/find")
     public AjaxResult find(SysWorkTimeSet sysWorkTimeSet) {
 
-        return success(sysWorkTimeSetService.workTimePageList(sysWorkTimeSet));
+        return sysWorkTimeSetService.workTimePageList(sysWorkTimeSet);
     }
 
     /**
@@ -78,7 +78,9 @@ public class SysWorkTimeSetController extends BaseController {
         } else {
             workTimeSet = sysWorkTimeSetService.selectSysWorkTimeSetById(id);
         }
-        workTimeSet.setMonthEnable(1L);
+        if (workTimeSet!=null) {
+            workTimeSet.setMonthEnable(1L);
+        }
         return success(workTimeSet);
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysBankPhysicalDefenseConstruction.java

@@ -2,6 +2,8 @@ package com.xunmei.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -30,6 +32,7 @@ public class SysBankPhysicalDefenseConstruction extends BaseEntity
 private static final long serialVersionUID=1L;
 
     /** $column.columnComment */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 标准 */
@@ -37,7 +40,7 @@ private static final long serialVersionUID=1L;
     private String standard;
 
     /** 达标日期 */
-            @JsonFormat(pattern = "yyyy-MM-dd")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
             @ApiModelProperty(value = "达标日期")
     private Date dateOfCompliance;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysOrgExtend.java

@@ -1,5 +1,8 @@
 package com.xunmei.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -12,6 +15,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import com.xunmei.common.core.web.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 机构扩展对象 sys_org_extend
  *
@@ -29,6 +34,7 @@ public class SysOrgExtend extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -47,7 +53,7 @@ public class SysOrgExtend extends BaseEntity {
      * 营业场所面积
      */
     @ApiModelProperty(value = "营业场所面积")
-    private Long premisesArea;
+    private Double premisesArea;
 
     /**
      * 是否自有产权
@@ -120,13 +126,22 @@ public class SysOrgExtend extends BaseEntity {
      */
     @ApiModelProperty(value = "银行物防建设id")
     private Long bankPhysicalDefenseConstructionId;
+    @ApiModelProperty(value = "平台品牌")
+    private Long platformBrand;
+    @ApiModelProperty(value = "平台供应商品牌")
+    private Long platformSupplierBrand;
 
     /**
      * 机构id
      */
     @ApiModelProperty(value = "机构id")
     private Long orgId;
-
+    @ApiModelProperty(value = "建设时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date constructionTime;
+    @ApiModelProperty(value = "最近一次更新")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lastUpdateTime;
 
     @Override
     public String toString() {
@@ -160,7 +175,7 @@ public class SysOrgExtend extends BaseEntity {
                 .append("askariCertificate", getAskariCertificate())
 
 
-                .append("businessLibraryType" ,getBusinessLibraryType())
+                .append("businessLibraryType", getBusinessLibraryType())
 
 
                 .append("dutyMode", getDutyMode())

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysOrgPhysicalDefenseConstruction.java

@@ -1,7 +1,10 @@
 package com.xunmei.system.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -24,76 +27,90 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_org_physical_defense_construction")
-@ApiModel(value = "SysOrgPhysicalDefenseConstruction对象" , description = "机构物防建设")
-public class SysOrgPhysicalDefenseConstruction extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
-
-    /** $column.columnComment */
+@ApiModel(value = "SysOrgPhysicalDefenseConstruction对象", description = "机构物防建设")
+public class SysOrgPhysicalDefenseConstruction extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 标准 */
-            @ApiModelProperty(value = "标准")
+    /**
+     * 标准
+     */
+    @ApiModelProperty(value = "标准")
     private String standard;
 
-    /** 达标日期 */
-            @JsonFormat(pattern = "yyyy-MM-dd")
-            @ApiModelProperty(value = "达标日期")
+    /**
+     * 达标日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "达标日期")
     private Date dateOfCompliance;
 
-    /** 是否证书佐证 */
-            @ApiModelProperty(value = "是否证书佐证")
+    /**
+     * 是否证书佐证
+     */
+    @ApiModelProperty(value = "是否证书佐证")
     private Long certificateEvidence;
 
-    /** 证书 */
-            @ApiModelProperty(value = "证书")
+    /**
+     * 证书
+     */
+    @ApiModelProperty(value = "证书")
     private String certificate;
 
-    /** 佐证 */
-            @ApiModelProperty(value = "佐证")
+    /**
+     * 佐证
+     */
+    @ApiModelProperty(value = "佐证")
     private String evidence;
 
-    /** 机构id */
-            @ApiModelProperty(value = "机构id")
+    /**
+     * 机构id
+     */
+    @ApiModelProperty(value = "机构id")
     private Long orgId;
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" ,getId())
+                .append("id", getId())
 
 
-                .append("standard" ,getStandard())
+                .append("standard", getStandard())
 
 
-                .append("dateOfCompliance" ,getDateOfCompliance())
+                .append("dateOfCompliance", getDateOfCompliance())
 
 
-                .append("certificateEvidence" ,getCertificateEvidence())
+                .append("certificateEvidence", getCertificateEvidence())
 
 
-                .append("certificate" ,getCertificate())
+                .append("certificate", getCertificate())
 
 
-                .append("evidence" ,getEvidence())
+                .append("evidence", getEvidence())
 
 
-                .append("createTime" ,getCreateTime())
+                .append("createTime", getCreateTime())
 
 
-                .append("updateTime" ,getUpdateTime())
+                .append("updateTime", getUpdateTime())
 
 
-                .append("createBy" ,getCreateBy())
+                .append("createBy", getCreateBy())
 
 
-                .append("updateBy" ,getUpdateBy())
+                .append("updateBy", getUpdateBy())
 
 
-                .append("orgId" ,getOrgId())
-        .toString();
-        }
-        }
+                .append("orgId", getOrgId())
+                .toString();
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTime.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -38,8 +40,10 @@ public class SysWorkTime extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private String id;
-
+    @TableField(exist = false)
+    String orgName;
     /**
      * 最后修改人id
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeMonth.java

@@ -2,6 +2,8 @@ package com.xunmei.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -30,6 +32,7 @@ public class SysWorkTimeMonth extends BaseEntity
 private static final long serialVersionUID=1L;
 
     /** $column.columnComment */
+    @JsonSerialize(using = ToStringSerializer.class)
     private String id;
 
     /** 最后修改人id */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSet.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -38,6 +40,7 @@ public class SysWorkTimeSet extends BaseEntity {
 
     @TableField(exist = false)
     private List<Long> orgIds;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     @ApiModelProperty("工作日")
     @TableField(exist = false)

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSetDayofweek.java

@@ -1,6 +1,8 @@
 package com.xunmei.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -30,6 +32,7 @@ public class SysWorkTimeSetDayofweek extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -49,6 +52,8 @@ public class SysWorkTimeSetDayofweek extends BaseEntity {
      */
     @ApiModelProperty(value = "一周的第几天，1表示周日,2表示周一")
     private Long dayOfWeek;
+    @TableField(exist = false)
+    private String  dayOfWeekText;
 
     /**
      * 上班时间

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysWorkTimeDto.java

@@ -5,5 +5,5 @@ import lombok.Data;
 
 @Data
 public class SysWorkTimeDto extends SysWorkTime {
-    private String OrgName;
+//    private String OrgName;
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysOrgExtendService.java

@@ -2,6 +2,7 @@ package com.xunmei.system.service;
 
 import java.util.List;
 
+import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.domain.SysOrgExtend;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,6 +22,7 @@ public interface ISysOrgExtendService extends IService<SysOrgExtend> {
      * @return 机构扩展
      */
     public SysOrgExtend selectSysOrgExtendById(Long id);
+    public SysOrgExtend selectSysOrgExtendByOrgId(Long id);
 
     /**
      * 查询机构扩展列表

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgExtendServiceImpl.java

@@ -2,6 +2,7 @@ package com.xunmei.system.service.impl;
 
 import java.util.List;
         import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xunmei.system.service.ISysOrgService;
@@ -84,6 +85,11 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
         return sysOrgExtendMapper.selectById(id);
     }
 
+    @Override
+    public SysOrgExtend selectSysOrgExtendByOrgId(Long id) {
+        return sysOrgExtendMapper.selectOne(new QueryWrapper<SysOrgExtend>().eq("org_id",id));
+    }
+
     /**
      * 查询机构扩展列表
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeServiceImpl.java

@@ -182,7 +182,11 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
      */
     @Override
     public SysWorkTime selectSysWorkTimeById(String id) {
-        return sysWorkTimeMapper.selectById(id);
+        SysWorkTime sysWorkTime = sysWorkTimeMapper.selectById(id);
+        if (sysWorkTime!=null) {
+            sysWorkTime.setOrgName(orgService.selectSysOrgById(sysWorkTime.getOrgId()).getName());
+        }
+        return sysWorkTime;
     }
     private boolean timesetIsEqual(SysWorkTime workTime, SysWorkTime dto) {
         return workTime.getIsEnable().equals(dto.getIsEnable())

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -111,7 +111,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
             //添加in条件
             query.in("org_id", ids);
         }
-        query.orderByDesc("effective_date");
+        query.orderByDesc
+                ("effective_date");
         //时间范围查询
         if (sysWorkTimeSet.getParams().get("beginTime") != null && sysWorkTimeSet.getParams().get("endTime") != null) {
             query.between("effective_date", sysWorkTimeSet.getParams().get("beginTime"), sysWorkTimeSet.getParams().get("endTime"));
@@ -125,41 +126,42 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
         list.forEach(l -> {
             ids.add(l.getId());
         });
-        List<SysWorkTimeSetDayofweek> dayOfWeeks = sysWorkTimeSetDayofweekMapper.findByWorkTimeSetIdIn(ids);
-        list.forEach(l -> {
-            List<SysWorkTimeSetDayofweek> dayOfWeekList = dayOfWeeks.stream().filter(d -> d.getWorkTimeSetId().equals(l.getId())).collect(Collectors.toList());
-            String workDay = "";
-            workDay = getWorkDay(dayOfWeekList);
-            l.setWorkDay(workDay);
-            //当月和下月的作息不能删除
-            //获取当前时间的月份
-            Calendar cal = Calendar.getInstance();
-            cal.setTime(new Date());
-            int month = cal.get(Calendar.MONTH) + 1;
-            //获取l.getEffectiveDate()的月份
-            Calendar cal1 = Calendar.getInstance();
-            cal1.setTime(l.getEffectiveDate());
-            int month1 = cal1.get(Calendar.MONTH) + 1;
-            //l.getEffectiveDate()在当前时间之前的作息不能删除，当月和下月的作息不能删除
-            //下月后的模版可删除可编辑
-            if (month1 - month >= 2) {
-                l.setTimeCheck(0);
-            } else {
-                //本月之前的不能删除也不能编辑
-                if (month1 - month < 0) {
-                    l.setTimeCheck(1);
+        if (list.size() > 0) {
+            List<SysWorkTimeSetDayofweek> dayOfWeeks = sysWorkTimeSetDayofweekMapper.findByWorkTimeSetIdIn(ids);
+            list.forEach(l -> {
+                List<SysWorkTimeSetDayofweek> dayOfWeekList = dayOfWeeks.stream().filter(d -> d.getWorkTimeSetId().equals(l.getId())).collect(Collectors.toList());
+                String workDay = "";
+                workDay = getWorkDay(dayOfWeekList);
+                l.setWorkDay(workDay);
+                //当月和下月的作息不能删除
+                //获取当前时间的月份
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(new Date());
+                int month = cal.get(Calendar.MONTH) + 1;
+                //获取l.getEffectiveDate()的月份
+                Calendar cal1 = Calendar.getInstance();
+                cal1.setTime(l.getEffectiveDate());
+                int month1 = cal1.get(Calendar.MONTH) + 1;
+                //l.getEffectiveDate()在当前时间之前的作息不能删除，当月和下月的作息不能删除
+                //下月后的模版可删除可编辑
+                if (month1 - month >= 2) {
+                    l.setTimeCheck(0);
                 } else {
-                    //当月和下月的数据1不能删除2生效的不能编辑3未生效的可以编辑
-                    if (l.getEffectiveDate().before(new Date())) {
-                        //2生效的不能编辑不能删除
-                        l.setTimeCheck(2);
+                    //本月之前的不能删除也不能编辑
+                    if (month1 - month < 0) {
+                        l.setTimeCheck(1);
                     } else {
-                        //3未生效的可编辑不能删除
-                        l.setTimeCheck(3);
-                    }
+                        //当月和下月的数据1不能删除2生效的不能编辑3未生效的可以编辑
+                        if (l.getEffectiveDate().before(new Date())) {
+                            //2生效的不能编辑不能删除
+                            l.setTimeCheck(2);
+                        } else {
+                            //3未生效的可编辑不能删除
+                            l.setTimeCheck(3);
+                        }
 
+                    }
                 }
-            }
 
 //            if(l.getEffectiveDate().before(new Date()) || month == month1 || month+1 == month1) {
 //                l.setTimeCheck(1);
@@ -167,9 +169,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
 //                l.setTimeCheck(0);
 //            }
 
-        });
-
-
+            });
+        }
         return AjaxResult.success(page);
     }
 
@@ -221,7 +222,27 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
     @Override
     public SysWorkTimeSet selectSysWorkTimeSetById(Long id) {
         SysWorkTimeSet sysWorkTimeSet = sysWorkTimeSetMapper.selectById(id);
-        sysWorkTimeSet.setDayOfWeeks(sysWorkTimeSetDayofweekMapper.selectList(new QueryWrapper<SysWorkTimeSetDayofweek>().eq("work_time_set_id", id)));
+        if(sysWorkTimeSet!=null) {
+            sysWorkTimeSet.setDayOfWeeks(sysWorkTimeSetDayofweekMapper.selectList(new QueryWrapper<SysWorkTimeSetDayofweek>().eq("work_time_set_id", id)));
+            for (SysWorkTimeSetDayofweek day :
+                    sysWorkTimeSet.getDayOfWeeks()) {
+                if (day.getDayOfWeek() == 1) {
+                    day.setDayOfWeekText("星期天");
+                } else if (day.getDayOfWeek() == 2) {
+                    day.setDayOfWeekText("星期一");
+                }else if (day.getDayOfWeek() == 3) {
+                    day.setDayOfWeekText("星期二");
+                }else if (day.getDayOfWeek() == 4) {
+                    day.setDayOfWeekText("星期三");
+                }else if (day.getDayOfWeek() == 5) {
+                    day.setDayOfWeekText("星期四");
+                }else if (day.getDayOfWeek() == 6) {
+                    day.setDayOfWeekText("星期五");
+                }else if (day.getDayOfWeek() == 7) {
+                    day.setDayOfWeekText("星期六");
+                }
+            }
+        }
         return sysWorkTimeSet;
     }
 
@@ -279,8 +300,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
             }
 
             // workTimeSetDayOfWeekRepository.deleteByWorkTimeSetIds(oldWorkTimeSetIds);
-            for (SysWorkTimeSetDayofweek s:
-                 dayOfWeeks) {
+            for (SysWorkTimeSetDayofweek s :
+                    dayOfWeeks) {
                 sysWorkTimeSetDayofweekMapper.insert(s);
             }
 //            if (CollectionUtils.isNotEmpty(dayOfWeeks)) {
@@ -378,6 +399,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
 //            }
 //        }
 //    }
+
     /**
      * 查询作息设置列表
      *