|
|
@@ -58,18 +58,26 @@ public class PersonnelServiceImpl implements PersonnelService {
|
|
|
//查询智能看板统计画像的统计人员信息报表
|
|
|
@Override
|
|
|
public ReturnMsg getPersonnelInfoList() {
|
|
|
-// List<Personnel> list = new ArrayList<>();
|
|
|
-// SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
|
|
|
-// Calendar c = Calendar.getInstance();
|
|
|
-// c.add(Calendar.MONTH, -5);
|
|
|
-// list.add(new Personnel(20, 30, 40, new Date()));
|
|
|
-// list.add(new Personnel(16, 191, 118, new Date()));
|
|
|
-// list.add(new Personnel(38, 28, 28, new Date()));
|
|
|
-// return ReturnMsg.ok(list);
|
|
|
+
|
|
|
String[] param = {"ownEmployees","outsourcingStaff","visitors"};
|
|
|
String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
|
|
|
- List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
|
- return ReturnMsg.ok(labels1);
|
|
|
+ // List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
|
+ List<Label> list = new ArrayList<>();
|
|
|
+ ThreadLocalRandom random = ThreadLocalRandom.current();
|
|
|
+ for (int i = 0; i < labKey.length; i++) {
|
|
|
+ Label label = new Label();
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ int ownEmployees = random.nextInt(50, 150);
|
|
|
+ int outsourcingStaff = random.nextInt(0, ownEmployees);
|
|
|
+ int visitors = random.nextInt(0, ownEmployees);
|
|
|
+ jsonObject.put(param[0],ownEmployees);
|
|
|
+ jsonObject.put(param[1],outsourcingStaff);
|
|
|
+ jsonObject.put(param[2],visitors);
|
|
|
+ label.setJsonObject(jsonObject);
|
|
|
+ label.setLabel(labKey[i]);
|
|
|
+ list.add(label);
|
|
|
+ }
|
|
|
+ return ReturnMsg.ok(list);
|
|
|
}
|
|
|
|
|
|
@Override
|
ZhangManMan