bug

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -572,8 +572,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 // 如果是项目公客, 则直接绑定为当前置业的私客
                 orign.setRealtyConsultant(consultantUser);
                 orign.setVerifyStatus(CommConstant.VERIFY_AGREE);
-                orign.setStatus(CommConstant.CUSTOMER_REPORT);
-                orign.setEntryType(CommConstant.ENTRY_INPUT);
+                orign.setStatus(CommConstant.CUSTOMER_VISITE);
+                orign.setEntryType(CommConstant.ENTRY_VERIFY);
                 orign.setReportDate(LocalDateTime.now());
                 recommendCustomer = orign;
 //                updateById(orign);
@@ -596,9 +596,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             recommendCustomer.setCreateDate(LocalDateTime.now());
             recommendCustomer.setReportDate(LocalDateTime.now());
             recommendCustomer.setPersonId(null != custPerson ? custPerson.getPersonId() : null);
-            recommendCustomer.setEntryType(CommConstant.ENTRY_INPUT);
+            recommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
             recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-            recommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+            recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
             recommendCustomer.setRecommendPerson(consultant.getPersonId());
             recommendCustomer.setCirculationTime(LocalDateTime.now());
             recommendCustomer.setInstitutionId(building.getInstitutionId());

src/main/java/com/yunzhi/marketing/xlk/controller/PcIndexStatisticsController.java

@@ -111,6 +111,8 @@ public class PcIndexStatisticsController extends BaseController {
     public ResponseBean selectActivityList(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDateTime endDate,
                                           @RequestParam(value = "buildingId", required = false) String buildingId,
+                                          @RequestParam(value = "sortField", required = false) String sortField,
+                                          @RequestParam(value = "sortType", required = false) String sortType,
                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
                                           HttpServletRequest request) {
@@ -123,6 +125,8 @@ public class PcIndexStatisticsController extends BaseController {
         pcStatisticsDTO.setBuildingId(buildingId);
         pcStatisticsDTO.setPageNum(pageNum);
         pcStatisticsDTO.setPageSize(pageSize);
+        pcStatisticsDTO.setSortField(sortField);
+        pcStatisticsDTO.setSortType(sortType);
         return pcStatisticsService.selectActivityList(taUser, pcStatisticsDTO);
     }
 }

src/main/java/com/yunzhi/marketing/xlk/dto/PcStatisticsDTO.java

@@ -44,4 +44,8 @@ public class PcStatisticsDTO {
     private Integer pageSize;
 
     private Integer pageNum;
+
+    private String sortField;
+
+    private String sortType;
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -347,14 +347,16 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
         ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
-        customer.setPreparatoryDate(LocalDateTime.now());
-        channelCustomerMapper.updateById(customer);
+        if (null != customer) {
+            customer.setPreparatoryDate(LocalDateTime.now());
+            channelCustomerMapper.updateById(customer);
+        }
 
         CustomerPreparatory customerPreparatory = params.getCustomerPreparatory();
         customerPreparatory.setCreateDate(LocalDateTime.now());
-        customerPreparatory.setBuildingId(customer.getBuildingId());
-        customerPreparatory.setRecommendPerson(customer.getRecommendPerson());
-        TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
+        customerPreparatory.setBuildingId(taRecommendCustomer.getBuildingId());
+        customerPreparatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
+        TaPerson recommendPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
         if (null != recommendPerson) {
             customerPreparatory.setRealtyConsultantName(recommendPerson.getName());
         }
@@ -363,7 +365,8 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         if (null != channelPerson) {
             customerPreparatory.setRealtyConsultantName(channelPerson.getName());
         }
-        customerPreparatory.setOrgId(customer.getOrgId());
+        customerPreparatory.setOrgId(taRecommendCustomer.getOrgId());
+        customerPreparatory.setCustomerId(taRecommendCustomer.getCustomerId());
         customerPreparatoryMapper.insert(customerPreparatory);
         return ResponseBean.success("审核成功");
     }
@@ -384,12 +387,14 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
         ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
-        customer.setCommissionDate(LocalDateTime.now());
-        channelCustomerMapper.updateById(customer);
+        if (null != customer) {
+            customer.setCommissionDate(LocalDateTime.now());
+            channelCustomerMapper.updateById(customer);
+        }
 
-        customerSignatory.setBuildingId(customer.getBuildingId());
-        customerSignatory.setRecommendPerson(customer.getRecommendPerson());
-        TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
+        customerSignatory.setBuildingId(taRecommendCustomer.getBuildingId());
+        customerSignatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
+        TaPerson recommendPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
         if (null != recommendPerson) {
             customerSignatory.setRealtyConsultantName(recommendPerson.getName());
         }
@@ -398,7 +403,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         if (null != channelPerson) {
             customerSignatory.setRealtyConsultantName(channelPerson.getName());
         }
-        customerSignatory.setOrgId(customer.getOrgId());
+        customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setCreateDate(LocalDateTime.now());
         customerSignatory.setType("commission");
         customerSignatoryMapper.insert(customerSignatory);
@@ -422,14 +427,16 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
         ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
-        customer.setSignedDate(LocalDateTime.now());
-        customer.setRealtyConsultant(customerSignatory.getRealtyConsultant());
-        channelCustomerMapper.updateById(customer);
+        if (null != customer) {
+            customer.setSignedDate(LocalDateTime.now());
+            customer.setRealtyConsultant(customerSignatory.getRealtyConsultant());
+            channelCustomerMapper.updateById(customer);
+        }
 
         customerSignatory.setCreateDate(LocalDateTime.now());
-        customerSignatory.setBuildingId(customer.getBuildingId());
-        customerSignatory.setRecommendPerson(customer.getRecommendPerson());
-        TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
+        customerSignatory.setBuildingId(taRecommendCustomer.getBuildingId());
+        customerSignatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
+        TaPerson recommendPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
         if (null != recommendPerson) {
             customerSignatory.setRealtyConsultantName(recommendPerson.getName());
         }
@@ -438,7 +445,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         if (null != channelPerson) {
             customerSignatory.setRealtyConsultantName(channelPerson.getName());
         }
-        customerSignatory.setOrgId(customer.getOrgId());
+        customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setType("signatory");
         customerSignatoryMapper.insert(customerSignatory);
         return ResponseBean.success("审核成功");

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1020,7 +1020,7 @@ FROM
             null as channel_id,
             p.name as channelName,
             t.create_date,
-            if(v.customer_visit_id is not null || t.`status` = 2 ,true,false) as visitStatus
+            if(v.customer_visit_id is not null || t.`status` = 2 || t.realty_consultant is not null,true,false) as visitStatus
         FROM
             ta_recommend_customer t
          left JOIN ta_person p ON t.realty_consultant = p.person_id

src/main/resources/mapper/xlk/PcStatisticsMapper.xml

@@ -250,6 +250,10 @@
                 #{item}
             </foreach>
         </if>
-        order by t.create_date desc
+        order by
+        <if test="params.sortField != null and params.sortField != ''">
+            ${params.sortField} ${params.sortType},
+        </if>
+        t.create_date desc
     </select>
 </mapper>