|
@@ -8,16 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.hotent.base.manager.impl.BaseManagerImpl;
|
|
import com.hotent.base.manager.impl.BaseManagerImpl;
|
|
|
import com.hotent.base.query.PageList;
|
|
import com.hotent.base.query.PageList;
|
|
|
import com.hotent.base.util.StringUtil;
|
|
import com.hotent.base.util.StringUtil;
|
|
|
-import com.hotent.baseInfo.manager.CostCatalogManager;
|
|
|
|
|
-import com.hotent.baseInfo.model.AuditedUnit;
|
|
|
|
|
import com.hotent.baseInfo.dao.AuditedUnitDao;
|
|
import com.hotent.baseInfo.dao.AuditedUnitDao;
|
|
|
import com.hotent.baseInfo.manager.AuditedUnitManager;
|
|
import com.hotent.baseInfo.manager.AuditedUnitManager;
|
|
|
-import com.hotent.baseInfo.model.CostDocumentWh;
|
|
|
|
|
|
|
+import com.hotent.baseInfo.model.AuditedUnit;
|
|
|
import com.hotent.baseInfo.req.AuditedUnitPageReq;
|
|
import com.hotent.baseInfo.req.AuditedUnitPageReq;
|
|
|
import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
|
|
import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
|
|
|
import com.hotent.constant.BaseConstant;
|
|
import com.hotent.constant.BaseConstant;
|
|
|
-import com.hotent.project.model.CostAnnualPlan;
|
|
|
|
|
-import com.hotent.project.resp.CostAnnualPlanDetailResp;
|
|
|
|
|
import com.hotent.uc.api.model.IUser;
|
|
import com.hotent.uc.api.model.IUser;
|
|
|
import com.hotent.uc.manager.UserManager;
|
|
import com.hotent.uc.manager.UserManager;
|
|
|
import com.hotent.uc.model.User;
|
|
import com.hotent.uc.model.User;
|
|
@@ -29,10 +25,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.Arrays;
|
|
|
|
|
-import java.util.Collections;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, AuditedUnit> implements AuditedUnitManager {
|
|
public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, AuditedUnit> implements AuditedUnitManager {
|
|
@@ -102,7 +95,9 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
|
|
|
@Override
|
|
@Override
|
|
|
public AuditedUnitDetailResp detail(String unitId) {
|
|
public AuditedUnitDetailResp detail(String unitId) {
|
|
|
AuditedUnit costAnnualPlan = this.get(unitId);
|
|
AuditedUnit costAnnualPlan = this.get(unitId);
|
|
|
-
|
|
|
|
|
|
|
+ if(costAnnualPlan == null){
|
|
|
|
|
+ return null;
|
|
|
|
|
+ }
|
|
|
AuditedUnitDetailResp detailResp = CopyUtil.copy(costAnnualPlan, AuditedUnitDetailResp.class);
|
|
AuditedUnitDetailResp detailResp = CopyUtil.copy(costAnnualPlan, AuditedUnitDetailResp.class);
|
|
|
//单位级别:0:省/自治区/直辖市 1:市级 2:县级
|
|
//单位级别:0:省/自治区/直辖市 1:市级 2:县级
|
|
|
if(ObjectUtil.isNotEmpty(costAnnualPlan.getAreaCode()) && ObjectUtil.isNotEmpty(costAnnualPlan.getAreaLevel())){
|
|
if(ObjectUtil.isNotEmpty(costAnnualPlan.getAreaCode()) && ObjectUtil.isNotEmpty(costAnnualPlan.getAreaLevel())){
|