|
@@ -245,7 +245,7 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
|
|
|
valueList = Arrays.asList(employeeType.getInsideNum(), employeeType.getLoanNum(), employeeType.getAssociationNum(), employeeType.getPropertyNum());
|
|
|
}
|
|
|
List<String> xList = Arrays.asList("内部员工", "借调人员", "外协人员", "物业人员");
|
|
|
- List<String> colorList = Arrays.asList("#fec72f", "#2f82fe", "#7565ef", "#00ffff");
|
|
|
+ List<String> colorList = Arrays.asList("#00ffdf", "#ffd296", "#7565ef", "#0084ff");
|
|
|
List<Map<String, Object>> tempList = new ArrayList<>();
|
|
|
StringUtils.createdPieData(xList, colorList, valueList, tempList);
|
|
|
return tempList;
|
|
@@ -289,7 +289,7 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
|
|
|
List<String> nameList = Arrays.asList("内部人员", "借调人员", "外协人员", "物业人员","访客");
|
|
|
// 获取7天前的日期
|
|
|
List<String> dateList = DateUtils.generateDateList(7);
|
|
|
- List<String> colorList = Arrays.asList("#0084ff", "#ffd296", "#7565ef", "#00ffff","#ffcd3e");
|
|
|
+ List<String> colorList = Arrays.asList("#00ffdf", "#ffd296", "#7565ef", "#00ffff","#f4cb57");
|
|
|
List<String> keyList = Arrays.asList("inside", "loan", "association", "property","visitor");
|
|
|
QueryWrapper<PlatEmployeeTypeFlow> flowQueryWrapper = new QueryWrapper<>();
|
|
|
if(!Objects.equals(appOrg,"0000")){
|