Commit 764e04d4 by huluobin

update

parent 10757cfc
......@@ -55,6 +55,10 @@ public class StoreTechnician implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("入职日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date entryTime;
@ApiModelProperty("手机号")
private String mobile;
......
......@@ -461,10 +461,10 @@ public class Schedule {
career.setTechnicianId(storeTechnician.getId());
}
career.setJoinDate(storeTechnician.getCreateTime());
career.setJoinDate(storeTechnician.getEntryTime());
if (storeTechnician.getCreateTime() != null) {
long pastMills = System.currentTimeMillis() - storeTechnician.getCreateTime().getTime();
if (storeTechnician.getEntryTime() != null) {
long pastMills = System.currentTimeMillis() - storeTechnician.getEntryTime().getTime();
int day = (int) (pastMills / 1000 / 60 / 60 / 24);
career.setOnJobTime(day);
}
......
......@@ -157,7 +157,6 @@ public class CareerController {
public JsonResult<StoreData> storeData(@RequestHeader String token,
@RequestParam String month) {
StoreData storeData = storeDataService.storeData(month);
return JsonResult.success(storeData);
}
......
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