Merge remote-tracking branch 'origin/dev' into dev

admin/src/main/java/com/ximai/web/core/config/SwaggerConfig.java

@@ -112,7 +112,7 @@ public class SwaggerConfig {
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：宝绅MES管理系统_接口文档")
+                .title("标题：希迈MES管理系统_接口文档")
                 // 描述
                 .description("")
                 // 作者信息

mes/src/main/java/com/ximai/mes/cal/service/impl/CalShiftServiceImpl.java

@@ -138,11 +138,11 @@ public class CalShiftServiceImpl implements ICalShiftService {
             shift.setShiftName(UserConstants.CAL_SHIFT_NAME_DAY);
             shift.setOrderNum(1);
             shift.setStartTime("8:00");
-            shift.setEndTime("18:00");
+            shift.setEndTime("17:00");
             List<CalShiftVo> list = new ArrayList<>();
             CalShiftVo breakShift = new CalShiftVo();
             breakShift.setBreakStartTime("12:00");
-            breakShift.setBreakEndTime("14:00");
+            breakShift.setBreakEndTime("13:00");
             breakShift.setStartTime(null);
             breakShift.setEndTime(null);
             breakShift.setOrderNum(1);

mes/src/main/java/com/ximai/mes/pro/controller/ProFeedbackController.java

@@ -65,7 +65,6 @@ public class ProFeedbackController extends BaseController {
     public TableDataInfo<ProFeedbackVo> list(ProFeedbackCheckListDto proFeedbackCheckListDto) {
         ProFeedback proFeedback = new ProFeedback();
         BeanUtils.copyProperties(proFeedbackCheckListDto,proFeedback);
-        startPage();
         QueryWrapper<ProFeedback> query = new QueryWrapper<>();
         query.eq(StringUtils.isNotEmpty(proFeedback.getFeedbackType()), "f.feedback_type", proFeedback.getFeedbackType());
         query.eq(StringUtils.isNotEmpty(proFeedback.getStatus()), "f.status", proFeedback.getStatus());
@@ -78,6 +77,7 @@ public class ProFeedbackController extends BaseController {
 //        query.eq(StringUtils.isNotEmpty(proFeedback.getUserId()), "pww.user_id", proFeedback.getUserId());
         query.eq(StringUtils.isNotEmpty(proFeedback.getWorkunitId()), "tw.workunit_id", proFeedback.getWorkunitId());
         if(proFeedbackCheckListDto.getIsCheckUser() && StringUtils.isEmpty(proFeedback.getWorkunitId())){
+
             List<MdWorkunitVo> mdWorkunitVolist = mdWorkunitService.selectMdWorkunitListByUser(new QueryWrapper<MdWorkunit>().eq("user_name", SecurityUtils.getUsername()));
             if(mdWorkunitVolist.size() < 1)
                 return  getDataTable(new ArrayList<>());
@@ -88,6 +88,7 @@ public class ProFeedbackController extends BaseController {
         query.like(StringUtils.isNotEmpty(proFeedback.getNickName()), "f.nick_name", proFeedback.getNickName());
         query.notIn("tw.status", TaskWorkunitStatusEnum.CLOSE.getStatus());
         query.orderByAsc("f.feedback_time");
+        startPage();
         List<ProFeedbackVo> list = proFeedbackService.queryProFeedbackListJoinTaskWorkUnit(query);
         List<ProFeedbackVo> proFeedbackVoList = new ArrayList<>();
         if (proFeedback.getUserId() != null) {

mes/src/main/java/com/ximai/mes/pro/service/impl/AppConfigServiceImpl.java

@@ -51,6 +51,12 @@ public class AppConfigServiceImpl implements IAppConfigService {
      */
     @Override
     public int insertAppConfig(AppConfig appConfig) {
+        List<AppConfig> lastVersion = this.selectLastVersion(appConfig.getAppName());
+        lastVersion.forEach(s->{
+            s.setLastVersion(0);
+            appConfig.updateAction();
+            this.updateAppConfig(appConfig);
+        });
         appConfig.createAction();
         return appConfigMapper.insertAppConfig(appConfig);
     }