|
@@ -128,9 +128,9 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
|
128
|
128
|
// 获取时间年
|
129
|
129
|
String yyyy = DateUtil.getYMDHMS(operationTime, "yyyy");
|
130
|
130
|
record.setCheckYear(Integer.parseInt(yyyy));
|
131
|
|
- // 获取时间所在年的第多少周
|
132
|
|
- Integer presentWeek = DateUtil.getPresentWeek(operationTime);
|
133
|
|
- record.setCheckYearWeek(presentWeek);
|
|
131
|
+ // 获取时间所在年的第多少周(前端和后台获取到的周不一致,选择使用前端数据)
|
|
132
|
+ /*Integer presentWeek = DateUtil.getPresentWeek(operationTime);
|
|
133
|
+ record.setCheckYearWeek(presentWeek);*/
|
134
|
134
|
}
|
135
|
135
|
|
136
|
136
|
@Override
|