Skip to content

A
amos-boot-biz
Commit 9e326fe7 authored by tianyiming's avatar tianyiming
Browse files
Options

两个规定-三项制度统计优化

parent 8fc4bbc7
Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 237 deletions
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/ThreeSystemsMapper.java
View file @ 9e326fe7
...@@ -15,7 +15,9 @@ import java.util.List; ...@@ -15,7 +15,9 @@ import java.util.List;
*/ */
public interface ThreeSystemsMapper extends BaseMapper<ThreeSystems> { public interface ThreeSystemsMapper extends BaseMapper<ThreeSystems> {
List<ThreeSystemsDto> getCompanyThreeSystemsStatisticsList(@Param("type") Integer type, @Param("startDay") String startDay, @Param("endDay") String endDay); List<ThreeSystemsDto> getCompanyThreeSystemsStatisticsList(@Param("staticTableName") String staticTableName,
@Param("startDay") String startDay,
@Param("endDay") String endDay);
void saveOrUpdateBatch(@Param("resultList") List<ThreeSystems> resultList); void saveOrUpdateBatch(@Param("resultList") List<ThreeSystems> resultList);
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/ThreeSystemsMapper.xml
View file @ 9e326fe7
...@@ -10,27 +10,26 @@ ...@@ -10,27 +10,26 @@
ei.supervise_org_code supervisoryUnitOrgCode, ei.supervise_org_code supervisoryUnitOrgCode,
ei.unit_type unitType, ei.unit_type unitType,
CASE CASE
WHEN ( WHEN (
SELECT COUNT SELECT COUNT
( 1 ) ( 1 )
FROM FROM
amos_tzs_biz.p_plan_task pt ${staticTableName} pt
WHERE WHERE
pt.finish_status = '2' pt.not_start = 0
AND ppt.use_code = pt.use_code AND pt.time_out = 0
AND pt.check_date BETWEEN #{startDay} AND (pt.risk_end > 0 or pt.no_risk_end > 0)
AND psd.unit_code = pt.unit_code
AND pt.check_time BETWEEN #{startDay}
AND #{endDay} AND #{endDay}
AND pt.plan_type = #{type}
) > 0 THEN ) > 0 THEN
1 ELSE 0 1 ELSE 0
END AS checkStatus END AS checkStatus
FROM FROM
amos_tzs_biz.tz_base_enterprise_info ei tz_base_enterprise_info ei
LEFT JOIN amos_tzs_biz.p_plan_task ppt ON ei.use_code = ppt.use_code LEFT JOIN ${staticTableName} psd ON ei.use_code = psd.unit_code
GROUP BY GROUP BY
ei.use_code ei.use_code
</select> </select>
<select id="saveOrUpdateBatch"> <select id="saveOrUpdateBatch">
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/ThreeSystemsController.java
View file @ 9e326fe7
...@@ -24,7 +24,7 @@ import java.util.LinkedHashMap; ...@@ -24,7 +24,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@RestController @RestController
@Api(tags = "三个规定统计") @Api(tags = "三个制度统计")
@RequestMapping(value = "/threeProvisions") @RequestMapping(value = "/threeProvisions")
public class ThreeSystemsController<string> extends BaseController { public class ThreeSystemsController<string> extends BaseController {
private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE"; private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/ThreeSystemsServiceImpl.java
View file @ 9e326fe7
...@@ -103,230 +103,236 @@ public class ThreeSystemsServiceImpl extends BaseService<ThreeSystemsDto, ThreeS ...@@ -103,230 +103,236 @@ public class ThreeSystemsServiceImpl extends BaseService<ThreeSystemsDto, ThreeS
} }
@Override @Override
public void getThreeSystemsStatistics(String type) { public void getThreeSystemsStatistics(String type) {
if (type.equals("1")) { if (type.equals("1")) {
createDayThreeSystemsStatistics(); createDayThreeSystemsStatistics();
} else if (type.equals("2")) { } else if (type.equals("2")) {
createWeekThreeSystemsStatistics(); createWeekThreeSystemsStatistics();
} else if (type.equals("3")) { } else if (type.equals("3")) {
createMonthThreeSystemsStatistics(); createMonthThreeSystemsStatistics();
} }
} }
@Scheduled(cron = "0 0 2,13 * * ?") @Scheduled(cron = "0 0 2,13 * * ?")
@SchedulerLock(name = "createDayThreeSystemsStatistics", lockAtMostFor = "PT1H") @SchedulerLock(name = "createDayThreeSystemsStatistics", lockAtMostFor = "PT1H")
public void createDayThreeSystemsStatistics() { public void createDayThreeSystemsStatistics() {
createThreeSystemsStatistics(1, false); createThreeSystemsStatistics(1, false);
} }
@Scheduled(cron = "0 0 2,13 * * ?") @Scheduled(cron = "0 0 2,13 * * ?")
@SchedulerLock(name = "createWeekThreeSystemsStatistics", lockAtMostFor = "PT1H") @SchedulerLock(name = "createWeekThreeSystemsStatistics", lockAtMostFor = "PT1H")
public void createWeekThreeSystemsStatistics() { public void createWeekThreeSystemsStatistics() {
Date nowDay = new Date(); Date nowDay = new Date();
String day = DateUtils.convertDateToString(nowDay, DateUtils.DATE_HOUR_PATTERN); String day = DateUtils.convertDateToString(nowDay, DateUtils.DATE_HOUR_PATTERN);
Calendar c = DateUtils.getCalendar(); Calendar c = DateUtils.getCalendar();
c.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); c.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
String monday = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_HOUR_PATTERN); String monday = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_HOUR_PATTERN);
Boolean flag = false; Boolean flag = false;
//判断今天是否本周第一天凌晨2点，如果是则最后一次更新上月数据 //判断今天是否本周第一天凌晨2点，如果是则最后一次更新上月数据
if (day.equals(monday)) { if (day.equals(monday)) {
flag = true; flag = true;
} }
createThreeSystemsStatistics(2, flag); createThreeSystemsStatistics(2, flag);
} }
@Scheduled(cron = "0 0 2,13 * * ?") @Scheduled(cron = "0 0 2,13 * * ?")
@SchedulerLock(name = "createMonthThreeSystemsStatistics", lockAtMostFor = "PT1H") @SchedulerLock(name = "createMonthThreeSystemsStatistics", lockAtMostFor = "PT1H")
public void createMonthThreeSystemsStatistics() { public void createMonthThreeSystemsStatistics() {
Date nowDay = new Date(); Date nowDay = new Date();
String day = DateUtils.convertDateToString(nowDay, DateUtils.DATE_HOUR_PATTERN); String day = DateUtils.convertDateToString(nowDay, DateUtils.DATE_HOUR_PATTERN);
String monthday = DateUtils.convertDateToString(nowDay, DateUtils.MONTH_PATTERN) + "-01 02"; String monthday = DateUtils.convertDateToString(nowDay, DateUtils.MONTH_PATTERN) + "-01 02";
Boolean flag = false; Boolean flag = false;
//判断今天是否本月第一天凌晨2点，如果是则最后一次更新上月数据 //判断今天是否本月第一天凌晨2点，如果是则最后一次更新上月数据
if (day.equals(monthday)) { if (day.equals(monthday)) {
flag = true; flag = true;
} }
createThreeSystemsStatistics(3, flag); createThreeSystemsStatistics(3, flag);
} }
private void createThreeSystemsStatistics(Integer type, Boolean isFirstDay) { private void createThreeSystemsStatistics(Integer type, Boolean isFirstDay) {
// 所有监管单位列表 // 所有监管单位列表
List<LinkedHashMap<String, Object>> supervisionList = tzsTwoStaffingService.getSupervisionList(); List<LinkedHashMap<String, Object>> supervisionList = tzsTwoStaffingService.getSupervisionList();
List<ThreeSystems> resultList; List<ThreeSystems> resultList;
// 所有企业排查情况列表(昨天/上周/上月) // 所有企业排查情况列表(昨天/上周/上月)
List<ThreeSystemsDto> oldStaffingCompanyList; List<ThreeSystemsDto> oldStaffingCompanyList;
// 所有企业排查情况列表(今天/本周/本月) // 所有企业排查情况列表(今天/本周/本月)
List<ThreeSystemsDto> newStaffingCompanyList; List<ThreeSystemsDto> newStaffingCompanyList;
String start = " 00:00:00"; String start = " 00:00:00";
String end = " 23:59:59"; String end = " 23:59:59";
Date nowDay = new Date(); Date nowDay = new Date();
String day = DateUtils.getDateNowShortStr(); String day = DateUtils.getDateNowShortStr();
String hour = DateUtils.convertDateToString(nowDay, DateUtils.DATE_HOUR_PATTERN); String hour = DateUtils.convertDateToString(nowDay, DateUtils.DATE_HOUR_PATTERN);
String startDay = ""; String startDay = "";
String endDay = ""; String endDay = "";
String lastStart = ""; String lastStart = "";
String lastEnd = ""; String lastEnd = "";
// 根据类型设置不同的时间 // 根据类型设置不同的时间
if (1 == type) { if (1 == type) {
startDay = day + start; startDay = day + start;
endDay = day + end; endDay = day + end;
if (hour.endsWith("02")) { if (hour.endsWith("02")) {
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
// 获取昨天日期 // 获取昨天日期
LocalDate yesterday = today.minusDays(1); LocalDate yesterday = today.minusDays(1);
lastStart = yesterday + start; lastStart = yesterday + start;
lastEnd = yesterday + end; lastEnd = yesterday + end;
} }
} else if (2 == type) { } else if (2 == type) {
//获取当前周第一天： //获取当前周第一天：
Calendar c = DateUtils.getCalendar(); Calendar c = DateUtils.getCalendar();
c.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); c.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
startDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start; startDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start;
//获取当前周最后一天 //获取当前周最后一天
c.add(Calendar.DAY_OF_WEEK, 6); c.add(Calendar.DAY_OF_WEEK, 6);
endDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end; endDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end;
if (isFirstDay) { if (isFirstDay) {
//获取上前周第一天 //获取上前周第一天
c.add(Calendar.DAY_OF_WEEK, -13); c.add(Calendar.DAY_OF_WEEK, -13);
lastStart = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start; lastStart = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start;
//获取上前周最后一天 //获取上前周最后一天
c.add(Calendar.DAY_OF_WEEK, 6); c.add(Calendar.DAY_OF_WEEK, 6);
lastEnd = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end; lastEnd = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end;
} }
} else { } else {
//获取当前月第一天： //获取当前月第一天：
Calendar c = DateUtils.getCalendar(); Calendar c = DateUtils.getCalendar();
c.add(Calendar.MONTH, 0); c.add(Calendar.MONTH, 0);
c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天 c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
startDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start; startDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start;
//获取当前月最后一天 //获取当前月最后一天
c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH)); c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
endDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end; endDay = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end;
if (isFirstDay) { if (isFirstDay) {
//获取上月第一天 //获取上月第一天
c.add(Calendar.MONTH, -1); c.add(Calendar.MONTH, -1);
c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天 c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
lastStart = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start; lastStart = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + start;
//获取上月最后一天 //获取上月最后一天
c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH)); c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
lastEnd = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end; lastEnd = DateUtils.convertDateToString(c.getTime(), DateUtils.DATE_PATTERN) + end;
} }
} }
//获取当天、本周、本月新的数据 // todo 此处统计表名通过接口查询得到 接口暂未实现
newStaffingCompanyList = threeSystemsMapper.getCompanyThreeSystemsStatisticsList(type, startDay, endDay); String planType = type.toString();
//调用三项制度统计方法处理数据 String staticTableName = "p_static_day";
resultList = getThreeSystems(supervisionList, newStaffingCompanyList, type, startDay, true); //获取当天、本周、本月新的数据
//将新数据存入统计表中 newStaffingCompanyList = threeSystemsMapper.getCompanyThreeSystemsStatisticsList(staticTableName, startDay, endDay);
threeSystemsMapper.saveOrUpdateBatch(resultList); //调用三项制度统计方法处理数据
resultList = getThreeSystems(supervisionList, newStaffingCompanyList, type, startDay, true);
List<ThreeSystems> oldList; //将新数据存入统计表中
//根据lastStart和lastEnd判断是否需要更新日/周/月的历史数据（为空不更新） threeSystemsMapper.saveOrUpdateBatch(resultList);
if (!"".equals(lastStart) && !"".equals(lastEnd)) {
//获取日/周/月的历史数据 List<ThreeSystems> oldList;
oldStaffingCompanyList = threeSystemsMapper.getOldCompanyThreeSystemsStatisticsList(type, DateUtils.dateToString(lastStart)); //根据lastStart和lastEnd判断是否需要更新日/周/月的历史数据（为空不更新）
//获取日/周/月历史数据的最新状态数据 if (!"".equals(lastStart) && !"".equals(lastEnd)) {
List<ThreeSystemsDto> oldNewStaffingCompanyList = threeSystemsMapper.getCompanyThreeSystemsStatisticsList(type, lastStart, lastEnd); //获取日/周/月的历史数据
if (!ValidationUtil.isEmpty(oldNewStaffingCompanyList)) { oldStaffingCompanyList = threeSystemsMapper.getOldCompanyThreeSystemsStatisticsList(type, DateUtils.dateToString(lastStart));
// 调用三项制度统计方法处理数据 //获取日/周/月历史数据的最新状态数据
oldList = ValidationUtil.isEmpty(oldStaffingCompanyList) ? // todo 此处统计表名通过接口查询得到 接口暂未实现
getThreeSystems(supervisionList, oldNewStaffingCompanyList, type, lastStart, true) :
getThreeSystems(supervisionList, oldNewStaffingCompanyList, type, lastStart, false); List<ThreeSystemsDto> oldNewStaffingCompanyList = threeSystemsMapper.getCompanyThreeSystemsStatisticsList(staticTableName, lastStart, lastEnd);
//如果历史数据不为空，更新历史数据实体 if (!ValidationUtil.isEmpty(oldNewStaffingCompanyList)) {
if (!ValidationUtil.isEmpty(oldStaffingCompanyList)) { // 调用三项制度统计方法处理数据
if (!ValidationUtil.isEmpty(oldList)) { oldList = ValidationUtil.isEmpty(oldStaffingCompanyList) ?
for (ThreeSystems e : oldList) { getThreeSystems(supervisionList, oldNewStaffingCompanyList, type, lastStart, true) :
ThreeSystemsDto threeSystemsDto = oldStaffingCompanyList.stream().filter(i -> getThreeSystems(supervisionList, oldNewStaffingCompanyList, type, lastStart, false);
i.getSupervisoryUnitOrgCode().equals(e.getSupervisoryUnitOrgCode()) && //如果历史数据不为空，更新历史数据实体
i.getCheckDate().equals(e.getCheckDate())).collect(Collectors.toList()).get(0); if (!ValidationUtil.isEmpty(oldStaffingCompanyList)) {
e.setSequenceNbr(threeSystemsDto.getSequenceNbr()); if (!ValidationUtil.isEmpty(oldList)) {
} for (ThreeSystems e : oldList) {
} ThreeSystemsDto threeSystemsDto = oldStaffingCompanyList.stream().filter(i ->
} i.getSupervisoryUnitOrgCode().equals(e.getSupervisoryUnitOrgCode()) &&
//更新统计表历史数据 i.getCheckDate().equals(e.getCheckDate())).collect(Collectors.toList()).get(0);
threeSystemsMapper.saveOrUpdateBatch(oldList); e.setSequenceNbr(threeSystemsDto.getSequenceNbr());
} }
} }
} }
//更新统计表历史数据
/** threeSystemsMapper.saveOrUpdateBatch(oldList);
* 三项制度统计数据方法 }
* @param supervisionList 行政区划列表 }
* @param StaffingCompanyList 需要统计处理的数据列表 }
* @param type 统计类型
* @param date 统计日期，做筛选用，日统计传当天日期，周统计传周一日期，月统计传月一号日期 /**
* @param isNew 是否新数据，新数据会生成主键 * 三项制度统计数据方法
* @return *
*/ * @param supervisionList 行政区划列表
private List<ThreeSystems> getThreeSystems(List<LinkedHashMap<String, Object>> supervisionList, * @param StaffingCompanyList 需要统计处理的数据列表
List<ThreeSystemsDto> StaffingCompanyList, * @param type 统计类型
Integer type, * @param date 统计日期，做筛选用，日统计传当天日期，周统计传周一日期，月统计传月一号日期
String date, * @param isNew 是否新数据，新数据会生成主键
boolean isNew) { * @return
*/
List<ThreeSystems> resultList = new ArrayList<>(); private List<ThreeSystems> getThreeSystems(List<LinkedHashMap<String, Object>> supervisionList,
List<ThreeSystemsDto> StaffingCompanyList,
supervisionList.forEach(i -> { Integer type,
ThreeSystemsDto nowDayThreeSystemsDto = new ThreeSystemsDto(); String date,
//对应orgCode下所有注册企业列表 boolean isNew) {
List<ThreeSystemsDto> allUnit = StaffingCompanyList.stream().filter(ii -> ii.getSupervisoryUnitOrgCode().startsWith(i.get("orgCode").toString())).collect(Collectors.toList());
//对应注册企业下所有应排查的企业列表 List<ThreeSystems> resultList = new ArrayList<>();
List<ThreeSystemsDto> shouldCheckUnit = allUnit.stream().filter(ii -> !(ii.getUnitType().contains("个人主体") || ii.getUnitType().equals("检验检测机构"))).collect(Collectors.toList());
//应排查的企业下已排查完成的企业列表 supervisionList.forEach(i -> {
List<ThreeSystemsDto> checkCompleteUnit = shouldCheckUnit.stream().filter(ii -> "1".equals(ii.getCheckStatus())).collect(Collectors.toList()); ThreeSystemsDto nowDayThreeSystemsDto = new ThreeSystemsDto();
//对应orgCode下所有注册企业列表
if (isNew) { List<ThreeSystemsDto> allUnit = StaffingCompanyList.stream().filter(ii -> ii.getSupervisoryUnitOrgCode().startsWith(i.get("orgCode").toString())).collect(Collectors.toList());
try { //对应注册企业下所有应排查的企业列表
nowDayThreeSystemsDto.setSequenceNbr(IdWorker.getFlowIdWorkerInstance().nextId()); List<ThreeSystemsDto> shouldCheckUnit = allUnit.stream().filter(ii -> !(ii.getUnitType().contains("个人主体") || ii.getUnitType().equals("检验检测机构"))).collect(Collectors.toList());
} catch (Exception e) { //应排查的企业下已排查完成的企业列表
throw new RuntimeException(e); List<ThreeSystemsDto> checkCompleteUnit = shouldCheckUnit.stream().filter(ii -> "1".equals(ii.getCheckStatus())).collect(Collectors.toList());
}
} if (isNew) {
try {
nowDayThreeSystemsDto.setRecDate(new Date()); nowDayThreeSystemsDto.setSequenceNbr(IdWorker.getFlowIdWorkerInstance().nextId());
nowDayThreeSystemsDto.setRecUserId(amosRequestContext.getUserId()); } catch (Exception e) {
nowDayThreeSystemsDto.setRecUserName(amosRequestContext.getUserName()); throw new RuntimeException(e);
nowDayThreeSystemsDto.setIsDelete(false); }
}
nowDayThreeSystemsDto.setSupervisoryUnitId(i.get("sequenceNbr").toString());
nowDayThreeSystemsDto.setSupervisoryUnitLevel(i.get("level").toString()); nowDayThreeSystemsDto.setRecDate(new Date());
nowDayThreeSystemsDto.setSupervisoryUnitName(i.get("companyName").toString()); nowDayThreeSystemsDto.setRecUserId(amosRequestContext.getUserId());
nowDayThreeSystemsDto.setRecUserName(amosRequestContext.getUserName());
nowDayThreeSystemsDto.setRegisteredNum(allUnit.size()); nowDayThreeSystemsDto.setIsDelete(false);
nowDayThreeSystemsDto.setCheckNum(shouldCheckUnit.size());
nowDayThreeSystemsDto.setFinishCheckNum(checkCompleteUnit.size()); nowDayThreeSystemsDto.setSupervisoryUnitId(i.get("sequenceNbr").toString());
nowDayThreeSystemsDto.setSupervisoryUnitLevel(i.get("level").toString());
nowDayThreeSystemsDto.setSupervisoryUnitOrgCode(i.get("orgCode").toString()); nowDayThreeSystemsDto.setSupervisoryUnitName(i.get("companyName").toString());
nowDayThreeSystemsDto.setPlanType(1 == type ? "1" : 2 == type ? "2" : "3");
nowDayThreeSystemsDto.setCheckDate(DateUtils.dateToString(date)); nowDayThreeSystemsDto.setRegisteredNum(allUnit.size());
nowDayThreeSystemsDto.setCheckNum(shouldCheckUnit.size());
if (shouldCheckUnit.size() == 0) { nowDayThreeSystemsDto.setFinishCheckNum(checkCompleteUnit.size());
nowDayThreeSystemsDto.setProportion("0%");
} else { nowDayThreeSystemsDto.setSupervisoryUnitOrgCode(i.get("orgCode").toString());
DecimalFormat decimalFormat = new DecimalFormat("0.##"); nowDayThreeSystemsDto.setPlanType(1 == type ? "1" : 2 == type ? "2" : "3");
BigDecimal result = new BigDecimal(checkCompleteUnit.size()).divide(new BigDecimal(shouldCheckUnit.size()), 4, RoundingMode.HALF_UP); nowDayThreeSystemsDto.setCheckDate(DateUtils.dateToString(date));
nowDayThreeSystemsDto.setProportion(decimalFormat.format(result.multiply(new BigDecimal(100))) + "%");
} if (shouldCheckUnit.size() == 0) {
nowDayThreeSystemsDto.setProportion("0%");
ThreeSystems threeSystems = new ThreeSystems(); } else {
BeanUtils.copyProperties(nowDayThreeSystemsDto, threeSystems); DecimalFormat decimalFormat = new DecimalFormat("0.##");
resultList.add(threeSystems); BigDecimal result = new BigDecimal(checkCompleteUnit.size()).divide(new BigDecimal(shouldCheckUnit.size()), 4, RoundingMode.HALF_UP);
}); nowDayThreeSystemsDto.setProportion(decimalFormat.format(result.multiply(new BigDecimal(100))) + "%");
return resultList; }
}
ThreeSystems threeSystems = new ThreeSystems();
BeanUtils.copyProperties(nowDayThreeSystemsDto, threeSystems);
resultList.add(threeSystems);
});
return resultList;
}
} }
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsTwoStaffingServiceImpl.java
View file @ 9e326fe7
...@@ -156,6 +156,7 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz ...@@ -156,6 +156,7 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz
companyDto.setCheckStartTime(ObjectUtils.isEmpty(companyDto.getCheckStartTime()) ? startDay : companyDto.getCheckStartTime()); companyDto.setCheckStartTime(ObjectUtils.isEmpty(companyDto.getCheckStartTime()) ? startDay : companyDto.getCheckStartTime());
companyDto.setCheckEndTime(ObjectUtils.isEmpty(companyDto.getCheckEndTime()) ? endDay : companyDto.getCheckEndTime()); companyDto.setCheckEndTime(ObjectUtils.isEmpty(companyDto.getCheckEndTime()) ? endDay : companyDto.getCheckEndTime());
// todo 此处统计表名通过接口查询得到 接口暂未实现 // todo 此处统计表名通过接口查询得到 接口暂未实现
String planType = companyDto.getPlanType();
String staticTableName = "p_static_day"; String staticTableName = "p_static_day";
return tzsTwoStaffingMapper.getCompanyCheckList(page, orgCode, staticTableName, companyDto); return tzsTwoStaffingMapper.getCompanyCheckList(page, orgCode, staticTableName, companyDto);
} }
......
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