Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

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

@@ -62,10 +62,9 @@ public class InstitutionController extends BaseController {
             LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Institution::getOrgId,getOrgId(request));
             if (StringUtils.isEmpty(institutionCode)){
-                queryWrapper.eq(Institution::getType,1);
+                queryWrapper.likeRight(Institution::getInstitutionCode,"01");
             }else {
                 Institution institution = iInstitutionService.getById(institutionCode);
-                queryWrapper.eq(Institution::getType,institution.getType() + 1);
                 queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
             }
             queryWrapper.orderByDesc(Institution::getCreateDate);
@@ -139,7 +138,7 @@ public class InstitutionController extends BaseController {
             Institution institution = new Institution();
             BeanUtils.copyProperties(institutionDTO,institution);
             institution.setOrgId(orgId);
-            institution.setInstitutionCode(id);
+            institution.setInstitutionId(id);
              responseBean = iInstitutionService.updateInstitution(institution);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -33,5 +33,5 @@ public class InstitutionDTO implements Serializable {
     /**
      * 组织代码
      */
-    private String institutionId;
+    private String parentInstitutionId;
 }

src/main/java/com/yunzhi/marketing/xlk/entity/Institution.java

@@ -33,6 +33,9 @@ public class Institution implements Serializable {
     @TableId(type = IdType.UUID)
     private String institutionId;
 
+    /** 父级组织机构id */
+    private String parentInstitutionId ;
+
     /**
      * 组织代码
      */
@@ -48,11 +51,6 @@ public class Institution implements Serializable {
      */
     private Integer orgId;
 
-    /**
-     * 1是集团，2是区域子公司 3，是城市子公司
-     */
-    private Integer type;
-
     /**
      * 创建时间
      */

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

@@ -11,6 +11,7 @@ import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -34,47 +35,30 @@ public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Insti
      */
     @Override
     public ResponseBean saveInstitution(Institution institution) {
-        int institutionCodeLength = institution.getInstitutionCode().length();
-        if (institutionCodeLength != 2 && institutionCodeLength != 4 && institutionCodeLength != 6){
-            return ResponseBean.error("请输入合法长度的code", ResponseBean.ERROR_UNAVAILABLE);
-        }
 
+        Institution parentInstitution = institutionMapper.selectById(institution.getParentInstitutionId());
         // 根据code获取机构
         LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Institution::getInstitutionCode,institution.getInstitutionCode());
-        Institution childInstitution = institutionMapper.selectOne(queryWrapper);
-        if (null != childInstitution){
-            return ResponseBean.error("此组织机构code已存在", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        // 判断组织机构长度
-        // 集团插入
-        if (institutionCodeLength == 2){
-            institution.setType(1);
-        }
-
-        // 子区域插入
-        if (institutionCodeLength == 4){
-            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 2);
-            if (null == blocInstitution){
-                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            institution.setType(2);
-        }
-
-        // 子区域插入
-        if (institutionCodeLength == 6){
-            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 2);
-            if (null == blocInstitution){
-                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
+        queryWrapper.eq(Institution::getParentInstitutionId,institution.getParentInstitutionId());
+        queryWrapper.orderByDesc(Institution::getInstitutionCode);
+        List<Institution> institutions = institutionMapper.selectList(queryWrapper);
+        if (institutions.size() > 0) {
+            Institution lastInstitution = institutions.get(0);
+            String institutionCode = lastInstitution.getInstitutionCode();
+            String firstCode = institutionCode.substring(0, institutionCode.length() - 2);
+            String lastCode = institutionCode.substring(institutionCode.length() - 2);
+            String currentCode =String.valueOf(Integer.parseInt(lastCode) + 1);
+            if (currentCode.length() == 1) {
+                institution.setInstitutionCode(firstCode + "0" +currentCode);
+            }else {
+                institution.setInstitutionCode(firstCode + currentCode);
             }
 
-            Institution cityInstitution = getChildInstitution(institution.getInstitutionCode(), 2, 4);
-            if (null == cityInstitution){
-                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            institution.setType(3);
+        }else {
+            institution.setInstitutionCode(parentInstitution.getInstitutionCode() + "01");
         }
+
+        institution.setCreateDate(LocalDateTime.now());
         institutionMapper.insert(institution);
 
         return ResponseBean.success(institution);
@@ -107,50 +91,7 @@ public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Insti
      */
     @Override
     public ResponseBean updateInstitution(Institution institution) {
-        int institutionCodeLength = institution.getInstitutionCode().length();
-        if (institutionCodeLength != 2 && institutionCodeLength != 4 && institutionCodeLength != 6){
-            return ResponseBean.error("请输入合法长度的code", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        // 根据code获取机构
-        LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Institution::getInstitutionCode,institution.getInstitutionCode());
-        queryWrapper.ne(Institution::getInstitutionCode,institution.getInstitutionCode());
-        Institution childInstitution = institutionMapper.selectOne(queryWrapper);
-        if (null != childInstitution){
-            return ResponseBean.error("此组织机构code已存在", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        // 判断组织机构长度
-        // 集团插入
-        if (institutionCodeLength == 2){
-            institution.setType(1);
-        }
-
-        // 子区域插入
-        if (institutionCodeLength == 4){
-            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 1);
-            if (null == blocInstitution){
-                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            institution.setType(2);
-        }
-
-        // 子区域插入
-        if (institutionCodeLength == 6){
-            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 1);
-            if (null == blocInstitution){
-                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
-            }
-
-            Institution cityInstitution = getChildInstitution(institution.getInstitutionCode(), 2, 3);
-            if (null == cityInstitution){
-                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            institution.setType(3);
-        }
         institutionMapper.updateById(institution);
-
         return ResponseBean.success(institution);
     }
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -908,7 +908,7 @@ FROM
         xlk_channel_customer a
         LEFT JOIN ta_person b ON a.person_id = b.person_id
         where a.recommend_person = #{customerId}
-        and a.status = 1
+        and a.status not in (2,3)
         <if test="status != null and status !=''">
             and a.status = #{status}
         </if>