Commit 5419079c by zhiwj

代码规范

parent 4b333294
......@@ -14,7 +14,7 @@ import java.util.List;
* @ClassName: TabProblemMapper
* @Description:
* @author zhiwj
* @date 2020-09-08 18:50
* @date 2020-09-08 19:05
*/
public interface TabProblemMapper {
/**
......
......@@ -10,7 +10,7 @@ import java.util.Date;
* @ClassName: TabProblemReply
* @Description:
* @author zhiwj
* @date 2020-09-08 18:50
* @date 2020-09-08 19:06
*/
public class TabProblemReply {
/**
......
......@@ -32,6 +32,16 @@ import java.util.*;
@Service
public class EvaluateServiceImpl implements EvaluateService {
/**
* 产品要求查4年
*/
static Integer YEAR_NUM = 4;
/**
* 月数
*/
static Integer MONTH_NUM = 4;
@Autowired
private TabEvaluateMapper tabEvaluateMapper;
private Logger logger = LogManager.getLogger(EvaluateServiceImpl.class);
......@@ -306,7 +316,7 @@ public class EvaluateServiceImpl implements EvaluateService {
private List<String> getYear() {
List<String> list = new ArrayList<>();
int year = DateUtil.getYear(new Date());
for (int i = 0; i <= 4; i++) {
for (int i = 0; i <= YEAR_NUM; i++) {
list.add((year - i) + "");
}
return list;
......@@ -316,7 +326,7 @@ public class EvaluateServiceImpl implements EvaluateService {
List<String> list = new ArrayList<>();
int year = DateUtil.getYear(new Date());
DecimalFormat decimalFormat = new DecimalFormat("00");
for (int i = 1; i <= 12; i++) {
for (int i = 1; i <= MONTH_NUM; i++) {
String month = year + "-" + decimalFormat.format(i);
list.add(month);
}
......
......@@ -218,8 +218,8 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
Calendar cal2 = Calendar.getInstance();
cal2.setTime(endTimeDate);
long time2 = cal2.getTimeInMillis();
long between_days = (time2 - time1) / 86400000L;
int days = Integer.parseInt(String.valueOf(between_days));
long betweenDays = (time2 - time1) / 86400000L;
int days = Integer.parseInt(String.valueOf(betweenDays));
int step = days/5;
cal1.add(Calendar.DAY_OF_MONTH, step);
......
......@@ -45,8 +45,8 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
@Override
public ServiceResponse<Page<ProblemDTO>> listProblem(ProblemQO problemQO) {
com.github.pagehelper.Page<TabProblem> problemList = problemService.listProblem(problemQO);
Page<ProblemDTO> problemDTOPage = PageHelperUtils.changePageHelperToCurrentPage(problemList, ProblemDTO.class);
return EnterpriseServiceResponse.success(problemDTOPage);
Page<ProblemDTO> problemDtoPage = PageHelperUtils.changePageHelperToCurrentPage(problemList, ProblemDTO.class);
return EnterpriseServiceResponse.success(problemDtoPage);
}
@Override
......
......@@ -66,9 +66,9 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
problemDTO.setHasOtherImage(imgList.size() > 1 ? Constants.OPEN : Constants.CLOSE);
}
ServiceResponse<MemberUserDTO> memberUserDTOServiceResponse = memberUserApiService.getByMcuId(problemDTO.getMemberId(), problemDTO.getEnterpriseId());
if (memberUserDTOServiceResponse.isSuccess()) {
MemberUserDTO memberUserDTO = memberUserDTOServiceResponse.getResult();
ServiceResponse<MemberUserDTO> memberUserDtoServiceResponse = memberUserApiService.getByMcuId(problemDTO.getMemberId(), problemDTO.getEnterpriseId());
if (memberUserDtoServiceResponse.isSuccess()) {
MemberUserDTO memberUserDTO = memberUserDtoServiceResponse.getResult();
problemDTO.setMemberName(memberUserDTO.getName());
problemDTO.setMemberPhone(memberUserDTO.getMobile());
// 门店
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment