add:服务单元管理bugfix

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qmth.sop.business.service.impl;
 
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -103,6 +104,9 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
                 throw ExceptionResultEnum.ERROR.exception("服务单元的当前状态更新为" + ServiceStatusEnum.FINISH.name() + "不允许移除");
             }
         }
+        UpdateWrapper<TBCrm> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().set(TBCrm::getServiceId,null).eq(TBCrm::getId,tbCrm.getId());
+        this.update(updateWrapper);
     }
 
     @Override

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBServiceRegionDetailServiceImpl.java

@@ -6,6 +6,7 @@ import com.qmth.sop.business.bean.dto.AreaDto;
 import com.qmth.sop.business.entity.TBServiceRegionDetail;
 import com.qmth.sop.business.mapper.TBServiceRegionDetailMapper;
 import com.qmth.sop.business.service.TBServiceRegionDetailService;
+import com.qmth.sop.common.contant.SystemConstant;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -32,6 +33,7 @@ public class TBServiceRegionDetailServiceImpl extends ServiceImpl<TBServiceRegio
         // 添加新绑定区域
         List<TBServiceRegionDetail> tbServiceRegionDetailList = areaDtoList.stream().flatMap(e -> {
             TBServiceRegionDetail detail = new TBServiceRegionDetail();
+            detail.setId(SystemConstant.getDbUuid());
             detail.setServiceRegionId(serviceRegionId);
             detail.setCountry(e.getCountry());
             detail.setProvince(e.getProvince());

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBServiceRegionServiceImpl.java

@@ -63,7 +63,7 @@ public class TBServiceRegionServiceImpl extends ServiceImpl<TBServiceRegionMappe
             List<CrmServiceResult> crmServiceResultList = tbCrmService.findCrmOrderByServiceIdList(serviceUnitIdList);
             // 规划位置
             List<Long> serviceRegionIdList = records.stream().map(ServiceRegionResult::getServiceRegionId).distinct().collect(Collectors.toList());
-            List<TBServiceRegionDetail> tbServiceRegionDetailList = tbServiceRegionDetailService.list(new QueryWrapper<TBServiceRegionDetail>().lambda().eq(TBServiceRegionDetail::getServiceRegionId, serviceRegionIdList));
+            List<TBServiceRegionDetail> tbServiceRegionDetailList = tbServiceRegionDetailService.list(new QueryWrapper<TBServiceRegionDetail>().lambda().in(TBServiceRegionDetail::getServiceRegionId, serviceRegionIdList));
 
             for (ServiceRegionResult record : records) {
                 Long unitId = record.getServiceUnitId();
@@ -133,11 +133,11 @@ public class TBServiceRegionServiceImpl extends ServiceImpl<TBServiceRegionMappe
             // 新增
             tbServiceRegion.setEnable(true);
             this.save(tbServiceRegion);
+            serviceRegionId = tbServiceRegion.getId();
         } else {
             // 编辑
             this.updateById(tbServiceRegion);
         }
-        serviceRegionId = tbServiceRegion.getId();
 
         // 更新详细信息
         tbServiceRegionDetailService.bindServiceRegionAreas(serviceRegionId, areaDtoList);

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -54,4 +54,8 @@ UPDATE sys_privilege SET related = '2011' WHERE (id = '234');
 UPDATE sys_privilege SET related = '2011' WHERE (id = '236');
 UPDATE sys_privilege SET related = '2013' WHERE (id = '238');
 UPDATE sys_privilege SET related = '2012' WHERE (id = '235');
-UPDATE sys_privilege SET related = '2012' WHERE (id = '237');
+UPDATE sys_privilege SET related = '2012' WHERE (id = '237');
+
+-- 2023/08/13
+ALTER TABLE `t_b_crm`
+    CHANGE COLUMN `service_id` `service_id` BIGINT NULL COMMENT '服务单元id' ;

sop-business/src/main/resources/mapper/TBServiceRegionMapper.xml

@@ -34,7 +34,7 @@
                     AND tbsrd.city LIKE CONCAT('%',#{city},'%'))
             </if>
             <if test="serviceStatus != null">
-                AND tbs.status = #{serviceStatus}
+                AND tbs.status != #{serviceStatus}
             </if>
         </where>
         ORDER BY tbsr.create_time DESC