Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java

@@ -46,6 +46,13 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    List<BaseOrgDO> orgList;
    List<SaasModuleDO> saasModuleList;
    private String manager; //管理员 - 关联user表id字段
    private String email; //管理员邮箱
    private String mobile; //管理员手机号码
    //审核不通过的原因
    private String auditFailedReason;
    //管理员姓名
    private String managerName;
	@Column(name = "org_code", nullable = false)
	public String getOrgCode() {
@@ -181,4 +188,25 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    public void setSaasModuleList(List<SaasModuleDO> saasModuleList) {
        this.saasModuleList = saasModuleList;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "audit_failed_reason")
    public String getAuditFailedReason() {
        return auditFailedReason;
    }
    public void setAuditFailedReason(String auditFailedReason) {
        this.auditFailedReason = auditFailedReason;
    }
    @Column(name = "manager_name")
    public String getManagerName() {
        return managerName;
    }
    public void setManagerName(String managerName) {
        this.managerName = managerName;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -56,6 +56,8 @@ public class BaseRequestMapping {
     */
    public static class SaasTypeDict extends Basic {
        public static final String PREFIX  = "/saas_type_dict";
        public static final String STATUS  = "/status";
        public static final String FIND_ALL_EXIST_CHECKED  = "/findAllExistChecked";
    }
    /**
@@ -66,6 +68,7 @@ public class BaseRequestMapping {
        public static final String STATUS  = "/status";
        public static final String IS_NAME_EXIST  = "/isNameExist";
        public static final String FIND_ALL  = "/findAll";
    }
    /**
@@ -232,6 +235,10 @@ public class BaseRequestMapping {
        public static final String saveWxTempConfig ="/saveWxTempConfig";
        public static final String findWxTempConfigList ="/findWxTempConfigList";
        public static final String findWxTemplateConfig ="/findWxTemplateConfig";
        public static final String getusersummary ="/getusersummary";
        public static final String getusercumulate ="/getusercumulate";
    }
    /**

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/ModuleVO.java

@@ -30,6 +30,8 @@ public class ModuleVO extends UuidIdentityVOWithOperator {
    private Integer isEnd ;
    @ApiModelProperty(value = "节点信息（0-表示非必选，1-表示必选)", example = "1")
    private Integer isMust ;
    @ApiModelProperty(value = "是否选中（0-表示未选，1-表示已选)", example = "1")
    private Integer isCheck ;
    @ApiModelProperty(value = "子集")
    private List<ModuleVO> children = new ArrayList<>();
@@ -104,4 +106,12 @@ public class ModuleVO extends UuidIdentityVOWithOperator {
    public void setChildren(List<ModuleVO> children) {
        this.children = children;
    }
    public Integer getIsCheck() {
        return isCheck;
    }
    public void setIsCheck(Integer isCheck) {
        this.isCheck = isCheck;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/SaasTypeModuleVO.java

@@ -36,6 +36,8 @@ public class SaasTypeModuleVO extends UuidIdentityVOWithOperator {
	private Integer isMust ;
	@ApiModelProperty(value = "逻辑删除标志1正常，0删除", example = "1")
	private Integer del ;
	@ApiModelProperty(value = "是否选中（0-表示未选，1-表示已选)", example = "1")
	private Integer isCheck =1;
	@ApiModelProperty(value = "子集", example = "子集")
	private List<SaasTypeModuleVO> children = new ArrayList<>();
@@ -134,4 +136,12 @@ public class SaasTypeModuleVO extends UuidIdentityVOWithOperator {
	public void setChildren(List<SaasTypeModuleVO> children) {
		this.children = children;
	}
	public Integer getIsCheck() {
		return isCheck;
	}
	public void setIsCheck(Integer isCheck) {
		this.isCheck = isCheck;
	}
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasVO.java

@@ -48,6 +48,18 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	List<BaseOrgVO> orgList;
	@ApiModelProperty(value = "业务模块", example = "业务模块")
	List<SaasModuleVO> saasModuleList;
    @ApiModelProperty(value = "管理员 - 关联user表id字段", example = "402303ee656498890165649ad2wa00sd")
    private String manager;
    @ApiModelProperty(value = "管理员邮箱", example = "admin@jkzl.com")
    private String email;
    @ApiModelProperty(value = "管理员手机号码", example = "18888888888")
    private String mobile;
    @ApiModelProperty(value = "审核不通过的原因", example = "信息不准确")
    private String auditFailedReason;
    @ApiModelProperty(value = "租户类型名称", example = "家医型")
    private String typeName;
    @ApiModelProperty(value = "管理员姓名", example = "张三")
    private String managerName;
	public String getOrgCode() {
		return orgCode;
@@ -168,4 +180,31 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	public void setSaasModuleList(List<SaasModuleVO> saasModuleVOList) {
		this.saasModuleList = saasModuleList;
	}
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getAuditFailedReason() {
        return auditFailedReason;
    }
    public void setAuditFailedReason(String auditFailedReason) {
        this.auditFailedReason = auditFailedReason;
    }
    public String getTypeName() {
        return typeName;
    }
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
    public String getManagerName() {
        return managerName;
    }
    public void setManagerName(String managerName) {
        this.managerName = managerName;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/contant/CommonContant.java

@@ -10,4 +10,6 @@ public class CommonContant {
     * 默认父类id 0
     */
    public static final String DEFAULT_PARENTID = "0";
    //是否必选0-表示非必选，1-表示必选
    public static final String IS_MUST = "1";
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/SaasTypeModuleDao.java

@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import javax.transaction.Transactional;
/**
 * Entity - 租户类型模块
 * Created by yeshijie on 2018/10/11.
@@ -18,4 +20,9 @@ public interface SaasTypeModuleDao extends PagingAndSortingRepository<SaasTypeMo
    @Modifying
    @Query("delete from SaasTypeModuleDO p where p.moduleId=?1 ")
    void deleteByModuleId(String moduleId);
    @Modifying
    @Transactional
    @Query("delete from SaasTypeModuleDO p where p.saasTypeId=?1 ")
    void deleteBySaasTypeId(String saasTypeId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleEndpoint.java

@@ -20,9 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -152,4 +150,6 @@ public class ModuleEndpoint extends EnvelopRestEndpoint {
        return success(moduleVOs);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasTypeDictEndpoint.java

@@ -1,12 +1,21 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.base.service.module.ModuleService;
import com.yihu.jw.base.service.module.SaasTypeModuleService;
import com.yihu.jw.base.service.saas.SaasTypeDictService;
import com.yihu.jw.entity.base.module.ModuleDO;
import com.yihu.jw.entity.base.module.SaasTypeModuleDO;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.restmodel.base.module.ModuleVO;
import com.yihu.jw.restmodel.base.module.SaasTypeModuleVO;
import com.yihu.jw.restmodel.base.saas.SaasTypeDictVO;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.web.status.EnvelopStatus;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,7 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
 * Endpoint - SaasTypeDict
@@ -29,8 +39,10 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SaasTypeDictService saasTypeDictService;
//    @Autowired
//    private SaasDefaultModuleFunctionService saasDefaultModuleFunctionService;
    @Autowired
    private ModuleService moduleService;
    @Autowired
    private SaasTypeModuleService saasTypeModuleService;
    @PostMapping(value = BaseRequestMapping.SaasTypeDict.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
@@ -50,7 +62,7 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
    }
    @PostMapping(value = BaseRequestMapping.Saas.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SaasTypeDict.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<SaasTypeDictVO> update(
            @ApiParam(name = "saasTypeDictJson", value = "saas类型Json数据")
@@ -61,16 +73,16 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
        if (null == saasTypeDictDO.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        if (saasTypeDictService.isSaasTypeDictExistByNameAndId(saasTypeDictDO.getId(),saasTypeDictDO.getName())) {
        if (saasTypeDictService.isSaasTypeDictExistByNameAndId(saasTypeDictDO.getId(), saasTypeDictDO.getName())) {
            return failed("租户类型名称重复！", ObjEnvelop.class);
        }
        //删除关联的模块
//        saasDefaultModuleFunctionService.deleteBySaasType(saasTypeDictDO.getCode());
        saasTypeModuleService.deleteBySaasTypeId(saasTypeDictDO.getId());
        saasTypeDictDO = saasTypeDictService.save(saasTypeDictDO, saasTypeDefaultModuleIds);
        return success("更新成功！", saasTypeDictDO, SaasTypeDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Saas.PAGE)
    @GetMapping(value = BaseRequestMapping.SaasTypeDict.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<SaasTypeDictVO> page(
            @ApiParam(name = "name", value = "租户类型名称")
@@ -96,7 +108,7 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
        return success(saasTypeDictDOS, count, page, size, SaasTypeDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Saas.LIST)
    @GetMapping(value = BaseRequestMapping.SaasTypeDict.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<SaasTypeDictVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
@@ -109,5 +121,89 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
        return success(saasTypeDictDOS, SaasTypeDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.SaasTypeDict.FINDBYID)
    @ApiOperation(value = "根据id获取单个租户类型+(右边树：已关联的模块)")
    public MixEnvelop<SaasTypeDictDO, List<ModuleVO>> findById(
            @ApiParam(name = "saasTypeDictId", value = "租户类型id")
            @RequestParam(value = "saasTypeDictId", required = true) String saasTypeDictId) throws Exception {
        MixEnvelop envelop = new MixEnvelop();
        //获取租户类型
        SaasTypeDictDO saasTypeDictDO = saasTypeDictService.findById(saasTypeDictId);
        envelop.setObj(saasTypeDictDO);
        if (null != saasTypeDictDO) {
            //根据租户类型获取关联的模块（右边树）
            String fis = "status=1;saasTypeId=" + saasTypeDictId;
            List<SaasTypeModuleDO> saasTypeModuleDOList = saasTypeModuleService.search(fis);
            //获取租户类型关联的生效中的模块
            List<SaasTypeModuleVO> saasTypeModuleVOS = convertToModels(saasTypeModuleDOList, new ArrayList<>(saasTypeModuleDOList.size()), SaasTypeModuleVO.class);
            Map<String, List<SaasTypeModuleVO>> map = saasTypeModuleVOS.stream().collect(Collectors.groupingBy(SaasTypeModuleVO::getParentModuleId));
            saasTypeModuleVOS.forEach(module -> {
                List<SaasTypeModuleVO> tmp = map.get(module.getModuleId());
                module.setChildren(tmp);
            });
            saasTypeModuleVOS = saasTypeModuleVOS.stream()
                    .filter(module -> CommonContant.DEFAULT_PARENTID.equals(module.getParentModuleId()))
                    .collect(Collectors.toList());
            envelop.setDetailModelList(saasTypeModuleVOS);
        }
        envelop.setStatus(EnvelopStatus.success.code);
        envelop.setMessage("success");
        return envelop;
    }
    @GetMapping(value = BaseRequestMapping.SaasTypeDict.FIND_ALL_EXIST_CHECKED)
    @ApiOperation(value = "获取租户类型-模块列表（左边树：全部模块，已关联和必选为选中状态）")
    public ListEnvelop<ModuleVO> findAllExistChecked(
            @ApiParam(name = "saasTypeDictId", value = "租户类型id")
            @RequestParam(value = "saasTypeDictId", required = false) String saasTypeDictId) throws Exception {
        //根据租户类型获取关联的模块
        String fis = "status=1;saasTypeId=" + saasTypeDictId;
        List<SaasTypeModuleDO> saasTypeModuleDOList = saasTypeModuleService.search(fis);
        Set<String> moduleIdSet = new HashSet<>();
        for (SaasTypeModuleDO saasTypeModuleDO : saasTypeModuleDOList) {
            moduleIdSet.add(saasTypeModuleDO.getModuleId());
        }
        //获取生效中的模块
        String filters = "status=1";
        List<ModuleDO> modules = moduleService.search(filters);
        List<ModuleVO> moduleVOs = convertToModels(modules, new ArrayList<>(modules.size()), ModuleVO.class);
        moduleVOs = moduleVOs.stream()
                .filter(module -> {
                    if (CommonContant.IS_MUST.equals(module.getIsMust())) {
                        //是否选中（0-表示未选，1-表示已选)
                        module.setIsCheck(1);
                    } else {
                        module.setIsCheck(0);
                    }
                    if (moduleIdSet.contains(module.getId())) {
                        //是否选中（0-表示未选，1-表示已选)
                        module.setIsCheck(1);
                    }
                    return true;
                }).collect(Collectors.toList());
        Map<String, List<ModuleVO>> map = moduleVOs.stream().collect(Collectors.groupingBy(ModuleVO::getParentId));
        moduleVOs.forEach(module -> {
            List<ModuleVO> tmp = map.get(module.getId());
            module.setChildren(tmp);
        });
        moduleVOs = moduleVOs.stream()
                .filter(module -> CommonContant.DEFAULT_PARENTID.equals(module.getParentId()))
                .collect(Collectors.toList());
        return success(moduleVOs);
    }
    @PostMapping(value = BaseRequestMapping.SaasTypeDict.STATUS)
    @ApiOperation(value = "生效/失效")
    public Envelop status(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id,
            @ApiParam(name = "status", value = " 失效-invalid,生效- effective", required = true)
            @RequestParam(value = "status") SaasTypeDictDO.Status status) {
        SaasTypeDictDO saasTypeDictDO = saasTypeDictService.findById(id);
        saasTypeDictDO.setStatus(status);
        saasTypeDictService.save(saasTypeDictDO);
        return success("修改成功");
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WechatController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by Trick on 2018/9/26.
 * Created by Trick on 2018/9/26..
 */
@RestController
@RequestMapping(BaseRequestMapping.WeChat.wechat_base)
@@ -232,4 +232,29 @@ public class WechatController extends EnvelopRestEndpoint {
    }
    //===================模板消息end==========================================
    //===================微信粉丝统计==========================================
    @GetMapping(value = BaseRequestMapping.WeChat.getusersummary)
    @ApiOperation(value = "获取用户增减数据", notes = "获取用户增减数据")
    public Envelop getusersummary(@ApiParam(name = "wechatId", value = "微信id")
                                  @RequestParam(value = "wechatId", required = true)String wechatId,
                                  @ApiParam(name = "beginDate", value = "开始时间，例如：2014-12-02")
                                  @RequestParam(value = "beginDate", required = true)String beginDate,
                                  @ApiParam(name = "endDate", value = "结束时间，例如：2014-12-07")
                                  @RequestParam(value = "endDate", required = true)String endDate) {
        return wechatService.getusersummary(wechatId,beginDate,endDate);
    }
    @GetMapping(value = BaseRequestMapping.WeChat.getusercumulate)
    @ApiOperation(value = "获取累计用户数据", notes = "获取累计用户数据")
    public Envelop getusercumulate(@ApiParam(name = "wechatId", value = "微信id")
                                   @RequestParam(value = "wechatId", required = true)String wechatId,
                                   @ApiParam(name = "beginDate", value = "开始时间，例如：2014-12-02")
                                   @RequestParam(value = "beginDate", required = true)String beginDate,
                                   @ApiParam(name = "endDate", value = "结束时间，例如：2014-12-07")
                                   @RequestParam(value = "endDate", required = true)String endDate) {
        return wechatService.getusercumulate(wechatId,beginDate,endDate);
    }
    //===================微信粉丝统计end==========================================
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/SaasTypeModuleService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.base.service.module;
import com.yihu.jw.base.dao.module.SaasTypeModuleDao;
import com.yihu.jw.entity.base.module.SaasTypeModuleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -11,6 +12,10 @@ import org.springframework.stereotype.Service;
 */
@Service
public class SaasTypeModuleService extends BaseJpaService<SaasTypeModuleDO, SaasTypeModuleDao> {
    @Autowired
    private SaasTypeModuleDao saasTypeModuleDao;
    public void deleteBySaasTypeId(String saasTypeId) {
        saasTypeModuleDao.deleteBySaasTypeId(saasTypeId);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasTypeDictService.java

@@ -1,9 +1,13 @@
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.module.ModuleDao;
import com.yihu.jw.base.dao.module.SaasTypeModuleDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasTypeDictDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.dao.user.UserRoleDao;
import com.yihu.jw.entity.base.module.ModuleDO;
import com.yihu.jw.entity.base.module.SaasTypeModuleDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.entity.base.user.UserDO;
@@ -29,39 +33,46 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
    @Autowired
    private SaasTypeDictDao saasTypeDictDao;
//    @Autowired
//    private FunctionDao functionDao;
//    @Autowired
//    private SaasDefaultModuleFunctionDao saasDefaultModuleFunctionDao;
    @Autowired
    private ModuleDao moduleDao;
    @Autowired
    private SaasTypeModuleDao saasTypeModuleDao;
    public SaasTypeDictDO save(SaasTypeDictDO saasTypeDictDO, String saasTypeDefaultModuleIds) {
        //初始化租户信息
        Integer code ;
    public SaasTypeDictDO save(SaasTypeDictDO saasTypeDictDO, String saasTypeModuleIds) {
        String saasTypeId;
        if (StringUtils.isEmpty(saasTypeDictDO.getId())) {
            //新增
            code = getNextSaasTypeDictCode();
            saasTypeDictDO.setCode(code);
            saasTypeDictDO.setCode(getNextSaasTypeDictCode());
            saasTypeId = getCode();
        } else {
            //编辑
            code = saasTypeDictDO.getCode();
            saasTypeId = saasTypeDictDO.getId();
        }
        //根据moduleId获取模块
        String[] ids = saasTypeModuleIds.split(",");
        SaasTypeModuleDO saasTypeModuleDO;
        List<SaasTypeModuleDO> saasDefaultModuleDOS = new ArrayList<>();
        for (String id : ids) {
            ModuleDO moduleDO = moduleDao.findOne(id);
            saasTypeModuleDO = new SaasTypeModuleDO();
            saasTypeModuleDO.setModuleId(id);
            saasTypeModuleDO.setName(moduleDO.getName());
            saasTypeModuleDO.setParentModuleId(moduleDO.getParentId());
            saasTypeModuleDO.setType(moduleDO.getType());
            saasTypeModuleDO.setStatus(moduleDO.getStatus());
            saasTypeModuleDO.setIsEnd(moduleDO.getIsEnd());
            saasTypeModuleDO.setIsMust(moduleDO.getIsMust());
            saasTypeModuleDO.setUrl(moduleDO.getUrl());
            saasTypeModuleDO.setRemark(moduleDO.getRemark());
            saasTypeModuleDO.setSaasTypeId(saasTypeId);
            saasDefaultModuleDOS.add(saasTypeModuleDO);
        }
        //根据moduleId获取模块关联的接口id
        String[] ids = saasTypeDefaultModuleIds.split(",");
//        List<FunctionDO> functionDOList = functionDao.findFunctionDOSByModuleIdExists(ids);
//        //初始化租户默认模块
//        List<SaasDefaultModuleFunctionDO> saasDefaultModuleDOS = new ArrayList<>();
//        functionDOList.forEach(item -> {
//            SaasDefaultModuleFunctionDO saasDefaultModuleFunctionDO = new SaasDefaultModuleFunctionDO();
//            saasDefaultModuleFunctionDO.setSaasType(code);
//            saasDefaultModuleFunctionDO.setModuleId(item.getModuleId());
//            saasDefaultModuleFunctionDO.setFunctionId(item.getId());
//            saasDefaultModuleDOS.add(saasDefaultModuleFunctionDO);
//        });
        //初始化租户默认模块
        saasTypeModuleDao.save(saasDefaultModuleDOS);
        //保存数据
        saasTypeDictDO = saasTypeDictDao.save(saasTypeDictDO);
//        saasDefaultModuleFunctionDao.save(saasDefaultModuleDOS);
        return saasTypeDictDO;
        SaasTypeDictDO saasTypeDictDO1 = saasTypeDictDao.save(saasTypeDictDO);
        return saasTypeDictDO1;
    }
    /**
@@ -88,4 +99,9 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
        BigInteger count = (BigInteger) sqlQuery.uniqueResult();
        return count.compareTo(new BigInteger("0")) > 0;
    }
    public SaasTypeDictDO findById(String id) {
        return saasTypeDictDao.findById(id);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -5,7 +5,6 @@ import com.yihu.jw.entity.base.wx.*;
import com.yihu.jw.restmodel.base.wx.*;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,7 @@ import java.util.Map;
import java.util.UUID;
/**
 * Created by trick on 2017/5/20 0020.
 * Created by trick on 2017/5/20 0020
 */
@Service
@Transactional
@@ -43,6 +42,8 @@ public class WechatService {
    private WxTemplateDao wxTemplateDao;
    @Autowired
    private WxTemplateConfigDao wxTemplateConfigDao;
    @Autowired
    private WxAccessTokenService wxAccessTokenService;
    //====================微信与租户管理=======================
@@ -455,5 +456,28 @@ public class WechatService {
    }
    //===================模板消息end=======================================
    //===================微信统计==========================================
    public Envelop getusersummary(String wechatId,String beginDate,String endDate){
        String url ="https://api.weixin.qq.com/datacube/getusersummary?access_token="+wxAccessTokenService.getWxAccessTokenById(wechatId).getAccessToken();
        String param = "{ \n" +
                "    \"begin_date\": \""+beginDate+"\", \n" +
                "    \"end_date\": \""+endDate+"\"\n" +
                "}";
        String result = com.yihu.jw.util.wechat.wxhttp.HttpUtil.sendPost(url, param);
        return Envelop.getSuccess(result);
    }
    public Envelop getusercumulate(String wechatId,String beginDate,String endDate){
        String url ="https://api.weixin.qq.com/datacube/getusercumulate?access_token="+wxAccessTokenService.getWxAccessTokenById(wechatId).getAccessToken();
        String param = "{ \n" +
                "    \"begin_date\": \""+beginDate+"\", \n" +
                "    \"end_date\": \""+endDate+"\"\n" +
                "}";
        String result = com.yihu.jw.util.wechat.wxhttp.HttpUtil.sendPost(url, param);
        return Envelop.getSuccess(result);
    }
    //===================微信统计end=======================================
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

@@ -178,10 +178,10 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                        " cd.patient_id ) cd1 ON cd1.patient_id = ba.patient_id " +
                        " WHERE " + buffer +
                        " ORDER BY" +
                        " ba.create_time DESC " +
                        "LIMIT "+(page-1)*size+","+size +")ba1" +
                        " ba.create_time DESC )ba1" +
                        " ORDER BY " +
                        " ba1.total DESC";
                        " ba1.total DESC"+
                        " LIMIT "+(page-1)*size+","+size ;
        List<AccountDO> accountDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(AccountDO.class));
        String sqlCount = "SELECT count(1) AS total"+
                " FROM " +

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistHospitalServiceItemService.java

@@ -199,7 +199,7 @@ public class SpecialistHospitalServiceItemService extends EnvelopRestEndpoint {
            List<String> type = new ArrayList<>();
            for (int j = 0;j<hospitalServiceItemDOS1.size();j++){
                SpecialistServiceItemDO specialistServiceItemDO = hospitalServiceItemDOS1.get(j).getSpecialistServiceItemDO();
                if (itemType.get(i).equals(specialistServiceItemDO.getItemType())){
                if (itemType.get(i).equals(specialistServiceItemDO.getItemType())&& !type.contains(specialistServiceItemDO.getDiseaseItem())){
            type.add(specialistServiceItemDO.getDiseaseItem());
                }
            }