代码修改

business/base-service/src/main/java/com/yihu/jw/healthUpload/service/HealthReportingFrequencyService.java

@@ -1,11 +1,18 @@
package com.yihu.jw.healthUpload.service;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.healthUpload.DeptVO;
import com.yihu.jw.entity.healthUpload.HealthReportingFrequencyDO;
import com.yihu.jw.healthUpload.dao.HealthReportingFrequencyDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by yeshijie on 2022/11/17.
@@ -15,11 +22,35 @@ public class HealthReportingFrequencyService extends BaseJpaService<HealthReport
    @Resource
    private HealthReportingFrequencyDao healthReportingFrequencyDao;
    @Autowired
    private DictHospitalDeptDao hospitalDeptDao;
    public void deleteById(String id){
        healthReportingFrequencyDao.deleteById(id);
    }
    public HealthReportingFrequencyDO findDetail(String id){
        HealthReportingFrequencyDO frequencyDO = healthReportingFrequencyDao.findById(id).orElse(null);
        if(frequencyDO!=null){
            frequencyDO.setTypeName(getTypeName(frequencyDO.getType()));
            if(StringUtils.isNotBlank(frequencyDO.getDeptJson())){
                List<DeptVO> deptVOList = new ArrayList<>();
                String depts[] = frequencyDO.getDeptJson().split(",");
                for (String dep:depts){
                    DictHospitalDeptDO deptDO = hospitalDeptDao.findByCode(dep);
                    if(deptDO!=null){
                        DeptVO deptVO = new DeptVO();
                        deptVO.setCode(dep);
                        deptVO.setName(deptDO.getName());
                        deptVOList.add(deptVO);
                    }
                }
                frequencyDO.setDeptList(deptVOList);
            }
        }
        return frequencyDO;
    }
    public String getTypeName(Integer type){
        String name = "院内科室";
        switch (type){

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/RoleApiRelationService.java

@@ -36,11 +36,7 @@ public class RoleApiRelationService extends BaseJpaService<RoleApiRelation,RoleA
    public boolean deleteRoleApiRelationByRoleId(Long roleId){
        Collection<RoleApiRelation> relations =findByField("roleId", roleId);
        if (relations.size()>0){
            List<Long> deleteIds = new ArrayList<>();
            for (RoleApiRelation relation:relations){
                deleteIds.add(relation.getId());
            }
            delete(deleteIds);
            roleApiRelationRepository.deleteAll(relations);
        }
        return true;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/RoleFeatureRelationService.java

@@ -40,11 +40,7 @@ public class RoleFeatureRelationService extends BaseJpaService<RoleFeatureRelati
    public boolean deleteRoleFeatureRelationByRoleId(Long roleId){
        Collection<RoleFeatureRelation> relations =findByField("roleId", roleId);
        if(relations.size()>0){
            List<Long> deleteIds = new ArrayList<>();
            for(RoleFeatureRelation relation:relations){
                deleteIds.add(relation.getId());
            }
            delete(deleteIds);
            roleFeatureRelationRepository.deleteAll(relations);
        }
        return true;
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/healthUpload/HealthUploadPoint.java

@@ -80,6 +80,19 @@ public class HealthUploadPoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "reportingFrequencyById")
    @ApiOperation(value = "获取上报频率明细")
    public Envelop reportingFrequencyById (
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            return ObjEnvelop.getSuccess("",healthReportingFrequencyService.findDetail(id));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败");
        }
    }
    @GetMapping(value = "reportingFrequencyPage")
    @ApiOperation(value = "获取上报频率分页")
    public PageEnvelop reportingFrequencyPage (