|
@@ -43,18 +43,16 @@ import com.ozs.system.mapper.SysFileRefMapper;
|
|
import com.ozs.system.mapper.SysRoleMapper;
|
|
import com.ozs.system.mapper.SysRoleMapper;
|
|
import com.ozs.system.service.*;
|
|
import com.ozs.system.service.*;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.util.ObjectUtils;
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
-import javax.validation.Validator;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
-import java.util.Calendar;
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.LinkedHashMap;
|
|
import java.util.LinkedHashMap;
|
|
@@ -70,43 +68,41 @@ import java.util.stream.Collectors;
|
|
@Slf4j
|
|
@Slf4j
|
|
public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears> implements PlanYearsService {
|
|
public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears> implements PlanYearsService {
|
|
|
|
|
|
- @Autowired
|
|
|
|
- PlanYearsMapper planYearsMapper;
|
|
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private PlanYearsMapper planYearsMapper;
|
|
|
|
+ @Resource
|
|
private PlanQuarterMapper planQuarterMapper;
|
|
private PlanQuarterMapper planQuarterMapper;
|
|
- @Autowired
|
|
|
|
- protected Validator validator;
|
|
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private ISysDictTypeService dictTypeService;
|
|
private ISysDictTypeService dictTypeService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private ISysDeptService deptService;
|
|
private ISysDeptService deptService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private SysFileRefMapper sysFileRefMapper;
|
|
private SysFileRefMapper sysFileRefMapper;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private SysDeptOrganMapper sysDeptOrganMapper;
|
|
private SysDeptOrganMapper sysDeptOrganMapper;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private SysDeptMapper deptMapper;
|
|
private SysDeptMapper deptMapper;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private SysFileService fileService;
|
|
private SysFileService fileService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private SysRoleMapper sysRoleMapper;
|
|
private SysRoleMapper sysRoleMapper;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private ISysUserService userService;
|
|
private ISysUserService userService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private PmDemandMapper pmDemandMapper;
|
|
private PmDemandMapper pmDemandMapper;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private PlanQuarterServiceImpl quartzServiceImpl;
|
|
private PlanQuarterServiceImpl quartzServiceImpl;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private IPmDemandService demandService;
|
|
private IPmDemandService demandService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private ProvisionalPlanMapper provisionalPlanMapper;
|
|
private ProvisionalPlanMapper provisionalPlanMapper;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private SysFileRefService sysFileRefService;
|
|
private SysFileRefService sysFileRefService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private PmAuditDeptRefService pmAuditDeptRefService;
|
|
private PmAuditDeptRefService pmAuditDeptRefService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private PmAuditDeptRefMapper pmAuditDeptRefMapper;
|
|
private PmAuditDeptRefMapper pmAuditDeptRefMapper;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private PlanQuarterMapper quarterMapper;
|
|
private PlanQuarterMapper quarterMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -1177,7 +1173,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
}
|
|
}
|
|
vo.setParams(params);
|
|
vo.setParams(params);
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
- if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
|
|
|
|
|
|
+ if (!loginUser.getUserId().equals(Long.valueOf("1")) && StringUtils.isEmpty(vo.getPurchaseDeptId())) {
|
|
vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
|
|
vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
|
|
}
|
|
}
|
|
List<PlanYears> planYears = planYearsMapper.query(vo);
|
|
List<PlanYears> planYears = planYearsMapper.query(vo);
|