| @@ -130,24 +130,20 @@ public class WxCUserDataController extends BaseController { | |||||
| } | } | ||||
| map.put("weekVosCount", weekVosCount); //周新增会员 | map.put("weekVosCount", weekVosCount); //周新增会员 | ||||
| //自然增长(全部排出导入的) | |||||
| //自然增长 | |||||
| //String startdate = DateUtils.getTimeBefore(30, new Date()); | //String startdate = DateUtils.getTimeBefore(30, new Date()); | ||||
| //String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | //String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | ||||
| //Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); | //Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); | ||||
| //Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); | //Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); | ||||
| dto.setStartTime(null); | |||||
| dto.setEndTime(null); | |||||
| long growCount = wxCUserService.findCount(dto); | |||||
| map.put("growCount", growCount); | |||||
| //全部导入的 | |||||
| WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | ||||
| wxCUserBasicInfoDto.setTenantId(getTenantId()); | wxCUserBasicInfoDto.setTenantId(getTenantId()); | ||||
| wxCUserBasicInfoDto.setStartTime(null); | wxCUserBasicInfoDto.setStartTime(null); | ||||
| wxCUserBasicInfoDto.setEndTime(null); | wxCUserBasicInfoDto.setEndTime(null); | ||||
| long importCount = wxCUserBasicInfoService.findCount(wxCUserBasicInfoDto); | |||||
| map.put("importCount", importCount); | |||||
| map.put("allHistoryUserCount", growCount+importCount); | |||||
| map.put("growCount", wxCUserBasicInfoService.findGrowUserCount(wxCUserBasicInfoDto)); | |||||
| //全部导入的 | |||||
| map.put("importCount", wxCUserBasicInfoService.findImportUserCount(wxCUserBasicInfoDto)); | |||||
| //全部 | |||||
| map.put("allHistoryUserCount", wxCUserBasicInfoService.findCount(wxCUserBasicInfoDto)); | |||||
| return new ResultData(map); | return new ResultData(map); | ||||
| } | } | ||||
| @@ -352,3 +348,4 @@ public class WxCUserDataController extends BaseController { | |||||
| } | } | ||||
| @@ -131,15 +131,6 @@ public class WxBillProperty implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") | @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") | ||||
| private String comments; | private String comments; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate") | |||||
| private Integer receivePayUpdate; | |||||
| public Integer getReceivePayUpdate() { | |||||
| return receivePayUpdate; | |||||
| } | |||||
| public void setReceivePayUpdate(Integer receivePayUpdate) { | |||||
| this.receivePayUpdate = receivePayUpdate; | |||||
| } | |||||
| public String getComments() { | public String getComments() { | ||||
| return comments; | return comments; | ||||
| } | } | ||||
| @@ -134,15 +134,6 @@ public class WxBillRent implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") | @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") | ||||
| private String comments; | private String comments; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate") | |||||
| private Integer receivePayUpdate; | |||||
| public Integer getReceivePayUpdate() { | |||||
| return receivePayUpdate; | |||||
| } | |||||
| public void setReceivePayUpdate(Integer receivePayUpdate) { | |||||
| this.receivePayUpdate = receivePayUpdate; | |||||
| } | |||||
| public String getComments() { | public String getComments() { | ||||
| return comments; | return comments; | ||||
| } | } | ||||
| @@ -19,20 +19,24 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S | |||||
| void updateScore(WxCUserBasicInfo record); | void updateScore(WxCUserBasicInfo record); | ||||
| void updateNewId(CUserBaseVo record); | void updateNewId(CUserBaseVo record); | ||||
| long findCountBySex(WxCUserBasicInfoDto dto); | long findCountBySex(WxCUserBasicInfoDto dto); | ||||
| long findCountByAge(WxCUserBasicInfoDto dto); | long findCountByAge(WxCUserBasicInfoDto dto); | ||||
| long findCountByScore(WxCUserBasicInfoDto dto); | long findCountByScore(WxCUserBasicInfoDto dto); | ||||
| List<WxCUserBasicInfo> findListByScore(WxCUserBasicInfoDto dto); | List<WxCUserBasicInfo> findListByScore(WxCUserBasicInfoDto dto); | ||||
| long findCount(WxCUserBasicInfoDto dto); | |||||
| long findCount(WxCUserBasicInfoDto dto); | |||||
| List<WxCUserBasicInfoVo> findVoList(WxCUserBasicInfo wxCUserBasicInfo); | List<WxCUserBasicInfoVo> findVoList(WxCUserBasicInfo wxCUserBasicInfo); | ||||
| Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo); | |||||
| Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo); | |||||
| long findGrowUserCount(WxCUserBasicInfoDto dto); | |||||
| long findImportUserCount(WxCUserBasicInfoDto dto); | |||||
| } | } | ||||
| @@ -131,4 +131,20 @@ public interface WxCUserBasicInfoService { | |||||
| void exportCarPayData(WxCarPayRecord record, HttpServletRequest request, HttpServletResponse response); | void exportCarPayData(WxCarPayRecord record, HttpServletRequest request, HttpServletResponse response); | ||||
| long findCountByFilter(WxCUserBasicInfoDto dto); | long findCountByFilter(WxCUserBasicInfoDto dto); | ||||
| /** | |||||
| * 自然增长用户 | |||||
| * @param dto | |||||
| * @return | |||||
| */ | |||||
| long findGrowUserCount(WxCUserBasicInfoDto dto); | |||||
| /** | |||||
| * 导入用户数 | |||||
| * @param dto | |||||
| * @return | |||||
| */ | |||||
| long findImportUserCount(WxCUserBasicInfoDto dto); | |||||
| } | } | ||||
| @@ -833,4 +833,15 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| public long findCountByFilter(WxCUserBasicInfoDto dto) { | public long findCountByFilter(WxCUserBasicInfoDto dto) { | ||||
| return wxCUserBasicInfoMapper.findCount(dto); | return wxCUserBasicInfoMapper.findCount(dto); | ||||
| } | } | ||||
| @Override | |||||
| public long findGrowUserCount(WxCUserBasicInfoDto dto) { | |||||
| return wxCUserBasicInfoMapper.findGrowUserCount(dto); | |||||
| } | |||||
| @Override | |||||
| public long findImportUserCount(WxCUserBasicInfoDto dto) { | |||||
| return wxCUserBasicInfoMapper.findImportUserCount(dto); | |||||
| } | |||||
| } | } | ||||
| @@ -390,7 +390,7 @@ | |||||
| <if test=" null != tagIds "> | <if test=" null != tagIds "> | ||||
| and JSON_CONTAINS(JSON_ARRAY(cut.tags),JSON_ARRAY | and JSON_CONTAINS(JSON_ARRAY(cut.tags),JSON_ARRAY | ||||
| <foreach collection="tagIds" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="tagIds" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| #{idItem} | |||||
| #{idItem} | |||||
| </foreach> | </foreach> | ||||
| ) | ) | ||||
| </if> | </if> | ||||
| @@ -411,4 +411,20 @@ | |||||
| </select> | </select> | ||||
| <select id="findImportUserCount" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="java.lang.Long"> | |||||
| SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is not null | |||||
| <if test="null != tenantId"> | |||||
| and cubi.tenant_id =#{tenantId} | |||||
| and cu.tenant_id =#{tenantId} | |||||
| </if> | |||||
| </select> | |||||
| <select id="findGrowUserCount" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="java.lang.Long"> | |||||
| SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is null | |||||
| <if test="null != tenantId"> | |||||
| and cubi.tenant_id =#{tenantId} | |||||
| and cu.tenant_id =#{tenantId} | |||||
| </if> | |||||
| </select> | |||||
| </mapper> | </mapper> | ||||