Merge branch 'dev_sh'

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/bygl/ByglBygdBjPlugin.java

@@ -2,7 +2,6 @@ package com.lideeyunji.core.framework.enhance.example.report.bygl;
 
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.lideeyunji.core.framework.adapter.FrameWorkAdapter;
 import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
 import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
@@ -10,7 +9,10 @@ import com.lideeyunji.core.framework.entity.ByManagementGd;
 import com.lideeyunji.core.framework.entity.ByManagementJl;
 import com.lideeyunji.core.framework.entity.ByManagementPlan;
 import com.lideeyunji.core.framework.entity.ByManagementYs;
-import com.lideeyunji.core.framework.mapper.*;
+import com.lideeyunji.core.framework.mapper.ByManagementGdMapper;
+import com.lideeyunji.core.framework.mapper.ByManagementJlMapper;
+import com.lideeyunji.core.framework.mapper.ByManagementPlanMapper;
+import com.lideeyunji.core.framework.mapper.ByManagementYsMapper;
 import com.lideeyunji.tool.framework.common.constant.ByglConstant;
 import com.lideeyunji.tool.framework.common.util.object.BeanUtils;
 import com.lideeyunji.tool.framework.security.core.LoginUser;
@@ -19,14 +21,12 @@ import com.lideeyunji.tool.framework.yunji.tool.spring.SpringUtils;
 import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ByglByfaServiceImpl.java

@@ -18,14 +18,12 @@ import com.lideeyunji.tool.framework.common.constant.ByglConstant;
 import com.lideeyunji.tool.framework.common.util.object.BeanUtils;
 import com.lideeyunji.tool.framework.security.core.LoginUser;
 import com.lideeyunji.tool.framework.security.core.util.SecurityFrameworkUtils;
-import com.lideeyunji.tool.framework.yunji.enums.AcceptanceStatusEnum;
 import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.Year;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;

lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/entity/DevGzbxWxgdDO.java

@@ -238,9 +238,9 @@ public class DevGzbxWxgdDO {
     private String createUserName;
 
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
-    private Date repair_date;
+    private Date repairDate;
 
-    private String repair_time;
+    private String repairTime;
 
     private String leaderYsYj;