fix: 修改二级服务商可以更新区域

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -36,7 +36,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserAgreementHistory;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDrugQuizRelation;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmPkgQuizRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmQuiz;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
@@ -92,7 +91,6 @@ import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
 import com.qunzhixinxi.hnqz.admin.service.SysFileService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserAgreementHistoryService;
-import com.qunzhixinxi.hnqz.admin.service.SysUserExtRecordService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
@@ -103,7 +101,6 @@ import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaPharmacyService;
 import com.qunzhixinxi.hnqz.admin.service.WmDrugQuizRelationService;
 import com.qunzhixinxi.hnqz.admin.service.WmFeedbackService;
-import com.qunzhixinxi.hnqz.admin.service.WmPkgQuizRelationService;
 import com.qunzhixinxi.hnqz.admin.service.WmPlatformQuizTestResultService;
 import com.qunzhixinxi.hnqz.admin.service.WmQuizService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
@@ -242,13 +239,11 @@ public class ApiController {
     private final UpmsConfig upmsConfig;
     private final WmWkAlbumService wmWkAlbumService;
     private final WmUserSignDetailService wmUserSignDetailService;
-    private final SysUserExtRecordService sysUserExtRecordService;
     private final SysUserSubService sysUserSubService;
     private final WmTaskSubmissionRuleService taskSubmissionRuleService;
     private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
     private final MedicalEquipmentService medicalEquipmentService;
     private final Sequence taskSequence;
-    private final WmPkgQuizRelationService quizRelationService;
     private final WmDaHospitalService wmDaHospitalService;
     private final WmQuizService quizService;
     private final WmUserSignService wmUserSignService;
@@ -284,8 +279,8 @@ public class ApiController {
         Map<String, Object> configMap = new LinkedHashMap<>();
         Map<String, Object> dictMap = new LinkedHashMap<>();
 
-        List<WmTaskContentConfig> listConfig = wmTaskContentConfigService.list(
-                Wrappers.<WmTaskContentConfig>lambdaQuery().eq(WmTaskContentConfig::getDelFlag, CommonConstants.STATUS_NORMAL)
+        List<WmTaskContentConfig> listConfig = wmTaskContentConfigService.list(Wrappers.<WmTaskContentConfig>lambdaQuery()
+                        .eq(WmTaskContentConfig::getDelFlag, CommonConstants.STATUS_NORMAL)
                         .eq(WmTaskContentConfig::getEnableFlag, CommonConstants.STATUS_NORMAL)
                         .eq(WmTaskContentConfig::getTaskTypeId, taskTypeId)
                         .orderByAsc(WmTaskContentConfig::getSeq));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysEnterpriseAreaService.java

@@ -24,6 +24,14 @@ public interface SysEnterpriseAreaService extends IService<SysEnterpriseArea> {
      */
     void saveRelation(Long deptId, Collection<Long> areaCodes);
 
+    /**
+     * 更新企业区域关系
+     *
+     * @param deptId    企业ID
+     * @param areaCodes 区域ID
+     */
+    void updateRelation(Long deptId, Collection<Long> areaCodes);
+
     /**
      * 获取企业的区域
      *
@@ -47,5 +55,6 @@ public interface SysEnterpriseAreaService extends IService<SysEnterpriseArea> {
      */
     void delRelation(Long deptId);
 
+
     List<Long> listAreaEnts(List<Long> areas);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysEnterpriseAreaServiceImpl.java

@@ -57,6 +57,31 @@ public class SysEnterpriseAreaServiceImpl extends ServiceImpl<SysEnterpriseAreaM
 
     }
 
+    /**
+     * 更新企业区域关系
+     *
+     * @param deptId    企业ID
+     * @param areaCodes 区域ID
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRelation(Long deptId, Collection<Long> areaCodes) {
+        // 删除旧的
+        this.remove(Wrappers.<SysEnterpriseArea>lambdaQuery().eq(SysEnterpriseArea::getEntId, deptId).eq(SysEnterpriseArea::getAreaId, areaCodes));
+        // 插入信息
+        LocalDateTime now = LocalDateTime.now();
+        List<SysEnterpriseArea> collect = areaCodes.stream().map(code -> {
+            SysEnterpriseArea enterpriseArea = new SysEnterpriseArea();
+            enterpriseArea.setEntId(deptId);
+            enterpriseArea.setAreaId(code);
+            enterpriseArea.setCreateTime(now);
+            return enterpriseArea;
+
+        }).collect(Collectors.toList());
+
+        this.saveBatch(collect);
+    }
+
     /**
      * 获取企业的区域
      *

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -596,6 +596,11 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
             redisTemplate.delete(userNameKeys);
         }
 
+        // 如果是二级cso 则允许更新区域
+        if (sysDept.getLevel() == 4 && CollUtil.isNotEmpty(wmDaAgent.getAreaCodes())){
+            enterpriseAreaService.updateRelation(Long.valueOf(sysDept.getDeptId()), wmDaAgent.getAreaCodes());
+        }
+
         return R.ok();
     }