提交

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.center.taUser.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
@@ -16,12 +17,16 @@ import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.ITaBuildingReportService;
+import com.huiju.estateagents.service.ITdReportService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -60,6 +65,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
 	private TdPointsRulesMapper tdPointsRulesMapper;
+
+	@Autowired
+	private ITdReportService iTdReportService;
+
+	@Autowired
+	private ITaBuildingReportService iTaBuildingReportService;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -109,6 +120,24 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			}
 		}
 
+		// 插入统计，默认全部显示
+		QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+		queryWrapper.orderByDesc("create_date");
+		queryWrapper.eq("status", 1);
+		List<TdReport> tdReportList = iTdReportService.list(queryWrapper);
+		if (CollectionUtils.isNotEmpty(tdReportList)) {
+			List<TaBuildingReport> buildingReportList = tdReportList.stream().map(e -> {
+				TaBuildingReport taBuildingReport = new TaBuildingReport();
+				taBuildingReport.setOrgId(taOrg.getOrgId());
+				taBuildingReport.setReportCode(e.toString());
+				taBuildingReport.setCreateDate(LocalDateTime.now());
+
+				return taBuildingReport;
+			}).collect(Collectors.toList());
+
+			iTaBuildingReportService.saveBatch(buildingReportList);
+		}
+
 		taUser.setOrgId(taOrg.getOrgId());
 		taUser.setIsAdmin(true);
 		taUser.setLoginPassword(MD5Utils.md5(taUser.getLoginPassword()));

src/main/java/com/huiju/estateagents/controller/TaBuildingReportController.java

@@ -91,7 +91,7 @@ public class TaBuildingReportController extends BaseController {
                 list.add(taBuildingReport);
             });
             //先删除在添加
-            iTaBuildingReportService.deleteAll();
+            iTaBuildingReportService.deleteAll(orgId);
             if (iTaBuildingReportService.saveBatch(list)){
                 responseBean.addSuccess("保存成功");
             }else {

src/main/java/com/huiju/estateagents/controller/TaPosterController.java

@@ -1,12 +1,15 @@
 package com.huiju.estateagents.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPoster;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.TaPosterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +42,9 @@ public class TaPosterController extends BaseController {
     @Autowired
     public TaPosterService iPosterService;
 
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
 
     /**
      * 分页查询列表
@@ -81,6 +87,9 @@ public class TaPosterController extends BaseController {
             poster.setOrgId(getOrgId(request));
             poster.setCreateDate(LocalDateTime.now());
             if (iPosterService.save(poster)) {
+
+                // 为了兼容 小程序3.0 -> v3.4的后端
+                updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
             } else {
                 responseBean.addError("fail");
@@ -93,6 +102,22 @@ public class TaPosterController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 项目添加海报的时候，往项目的 poster 字段插入一张图片
+     * 为了兼容 小程序3.0 -> v3.4的后端
+     * @param poster
+     */
+    private void updateBuildingPoster(TaPoster poster) {
+        // 项目添加海报的时候，往项目的 poster 字段插入一张图片
+        // 为了兼容 小程序3.0 -> v3.4的后端
+        if ("building".equals(poster.getTargetType())) {
+            UpdateWrapper<TaBuilding> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("building_id", poster.getTargetId());
+            updateWrapper.set("poster", poster.getPosterImg());
+            iTaBuildingService.update(updateWrapper);
+        }
+    }
+
     /**
      * 根据id删除对象
      *
@@ -130,6 +155,9 @@ public class TaPosterController extends BaseController {
         poster.setPosterId(id);
         try {
             if (iPosterService.updateById(poster)) {
+
+                // 为了兼容 小程序3.0 -> v3.4的后端
+                updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
             } else {
                 responseBean.addError("fail");

src/main/java/com/huiju/estateagents/controller/TdReportController.java

@@ -47,7 +47,7 @@ public class TdReportController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "后台客户留言列表", notes = "后台客户留言列表")
+    @ApiOperation(value = "后台报表列表", notes = "后台报表列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行")

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

@@ -75,8 +75,8 @@ public class TaDrainageRecordController extends BaseController {
     public ResponseBean taDrainageRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime",required = false) LocalDate startTime,
-                                             @RequestParam(value = "endTime",required = false) LocalDate endTime,
+                                             @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startTime,
+                                             @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endTime,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/mapper/TaBuildingReportMapper.java

@@ -16,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaBuildingReportMapper extends BaseMapper<TaBuildingReport> {
 	
-	void deleteAll();
+	void deleteAll(Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingReportService.java

@@ -13,5 +13,5 @@ import com.huiju.estateagents.entity.TaBuildingReport;
  */
 public interface ITaBuildingReportService extends IService<TaBuildingReport> {
 	
-	void deleteAll();
+	void deleteAll(Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingReportServiceImpl.java

@@ -22,7 +22,7 @@ public class TaBuildingReportServiceImpl extends ServiceImpl<TaBuildingReportMap
 	private TaBuildingReportMapper taBuildingReportMapper;
 	
 	@Override
-	public void deleteAll() {
-		taBuildingReportMapper.deleteAll();
+	public void deleteAll(Integer orgId) {
+		taBuildingReportMapper.deleteAll(orgId);
 	}
 }

src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java

@@ -97,7 +97,10 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		TaPointsExchange taPointsExchange = new TaPointsExchange();
 		taPointsExchange.setPersonId(taPerson.getPersonId());
 		taPointsExchange.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
-		taPointsExchange.setPhone(taPerson.getPhone());
+
+		// 存在 phone 字段没有值的情况，但是 tel 字段有值
+		String phone = org.apache.commons.lang3.StringUtils.isNotBlank(taPerson.getPhone()) ? taPerson.getPhone() : taPerson.getTel();
+		taPointsExchange.setPhone(phone);
 		taPointsExchange.setAvatar(taPerson.getAvatarurl());
 		taPointsExchange.setTargetId(taGoods.getGoodsId().toString());
 		taPointsExchange.setTargetName(taGoods.getGoodsName());

src/main/resources/mapper/TaBuildingReportMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaBuildingReportMapper">
 
     <delete id="deleteAll">
-        DELETE FROM ta_building_report
+        DELETE FROM ta_building_report where org_id = #{orgId}
     </delete>
 </mapper>