Bläddra i källkod

代码格式化

wangfeng 5 år sedan
förälder
incheckning
3d75f6d29d

+ 9 - 8
mrman-service/src/main/java/com/diagbot/facade/StdMissionDetailFacade.java

@@ -40,35 +40,36 @@ public class StdMissionDetailFacade extends StdMissionDetailServiceImpl {
     StdBehospitalInfoFacade stdBehospitalInfoFacade;
     @Autowired
     StdMissionInfoFacade stdMissionInfoFacade;
+
     public IPage<StdMissionDetailPageDTO> getMissionDetailPages(StdMissionDetailPageVO stdMissionDetailPageVO) {
         return stdMissionDetailService.getMissionDetailPage(stdMissionDetailPageVO);
     }
 
     public boolean addMissionDetails(StdMissionInfoAddVO stdMissionInfoAddVO) {
         //验证任务名是否存在
-        QueryWrapper<StdMissionInfo> stdQcresultTaskQuery =new QueryWrapper<>();
+        QueryWrapper<StdMissionInfo> stdQcresultTaskQuery = new QueryWrapper<>();
         stdQcresultTaskQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("mission_name",stdMissionInfoAddVO.getMissionName());
+                .eq("mission_name", stdMissionInfoAddVO.getMissionName());
         int sum = stdMissionInfoFacade.count(stdQcresultTaskQuery);
-        if(sum > 0){
+        if (sum > 0) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该任务名已存在!");
         }
         //添加数据生成任务
         Date now = DateUtil.now();
-        StdMissionInfo stdMissionInfo =new StdMissionInfo();
+        StdMissionInfo stdMissionInfo = new StdMissionInfo();
         BeanUtil.copyProperties(stdMissionInfoAddVO, stdMissionInfo);
         stdMissionInfo.setGmtCreate(now);
         stdMissionInfo.setGmtModified(now);
         boolean res = stdMissionInfoFacade.save(stdMissionInfo);
-        if(res){
-            Long missionId =stdMissionInfo.getId();
+        if (res) {
+            Long missionId = stdMissionInfo.getId();
             SthospitalInfoStatiVO sthospitalInfoPageVO = new SthospitalInfoStatiVO();
             sthospitalInfoPageVO.setPages(1);
             sthospitalInfoPageVO.setSize(5000);
             IPage<SthospitalInfoStatiDTO> sthospital = stdBehospitalInfoFacade.getStatistic(sthospitalInfoPageVO);
             List<SthospitalInfoStatiDTO> records = sthospital.getRecords();
             List<StdMissionDetail> missionDetailList = new ArrayList<>();
-            for(SthospitalInfoStatiDTO data:records){
+            for (SthospitalInfoStatiDTO data : records) {
                 StdMissionDetail stdMissionDetail = new StdMissionDetail();
                 BeanUtil.copyProperties(data, stdMissionDetail);
                 stdMissionDetail.setMissionId(missionId);
@@ -90,7 +91,7 @@ public class StdMissionDetailFacade extends StdMissionDetailServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("gmt_modified", now)
                 .set("status", stdMissionDetailUpVO.getStatus())
-                .set("remark",stdMissionDetailUpVO.getRemark()));
+                .set("remark", stdMissionDetailUpVO.getRemark()));
     }
 
     public boolean clearMissionDetails(StdMissionDetailClVO stdMissionDetailClVO) {

+ 13 - 13
mrman-service/src/main/java/com/diagbot/facade/StdMissionInfoFacade.java

@@ -32,7 +32,7 @@ public class StdMissionInfoFacade extends StdMissionInfoServiceImpl {
     @Autowired
     StdMissionDetailFacade stdMissionDetailFacade;
 
-    public  IPage<StdMissionInfoPageDTO> getMissionInfoPages(StdMissionInfoPageVO stdMissionInfoPageVO) {
+    public IPage<StdMissionInfoPageDTO> getMissionInfoPages(StdMissionInfoPageVO stdMissionInfoPageVO) {
         return stdMissionInfoService.getMissionInfoPages(stdMissionInfoPageVO);
     }
 
@@ -40,17 +40,17 @@ public class StdMissionInfoFacade extends StdMissionInfoServiceImpl {
         Date now = DateUtil.now();
         QueryWrapper<StdMissionInfo> missionInfoQuery = new QueryWrapper<>();
         missionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .ne("id",stdMissionInfoUpVO.getId() == null ? -1 : stdMissionInfoUpVO.getId())
-                .eq("mission_name",stdMissionInfoUpVO.getMissionName());
+                .ne("id", stdMissionInfoUpVO.getId() == null ? -1 : stdMissionInfoUpVO.getId())
+                .eq("mission_name", stdMissionInfoUpVO.getMissionName());
         int count = stdMissionInfoService.count(missionInfoQuery);
-        if(count > 0){
+        if (count > 0) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该任务名已存在!");
         }
         UpdateWrapper<StdMissionInfo> missionInfoUpdate = new UpdateWrapper<>();
         missionInfoUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id",stdMissionInfoUpVO.getId())
-                .set("mission_name",stdMissionInfoUpVO.getMissionName())
-                .set("gmt_modified",now);
+                .eq("id", stdMissionInfoUpVO.getId())
+                .set("mission_name", stdMissionInfoUpVO.getMissionName())
+                .set("gmt_modified", now);
 
         return stdMissionInfoService.update(missionInfoUpdate);
     }
@@ -60,16 +60,16 @@ public class StdMissionInfoFacade extends StdMissionInfoServiceImpl {
         //删除该任务
         UpdateWrapper<StdMissionInfo> missionInfoUpdate = new UpdateWrapper<>();
         missionInfoUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id",stdMissionInfoClearVO.getId())
-                .set("is_deleted",IsDeleteEnum.Y.getKey())
-                .set("gmt_modified",now);
+                .eq("id", stdMissionInfoClearVO.getId())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("gmt_modified", now);
         boolean res = stdMissionInfoService.update(missionInfoUpdate);
         //删除该任务所有明细
         UpdateWrapper<StdMissionDetail> missionDetailUpdate = new UpdateWrapper<>();
         missionDetailUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("mission_id",stdMissionInfoClearVO.getId())
-                .set("is_deleted",IsDeleteEnum.Y.getKey())
-                .set("gmt_modified",now);
+                .eq("mission_id", stdMissionInfoClearVO.getId())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("gmt_modified", now);
         stdMissionDetailFacade.update(missionDetailUpdate);
         return res;
     }

+ 2 - 2
mrman-service/src/main/java/com/diagbot/mapper/StdMissionDetailMapper.java

@@ -1,14 +1,14 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.StdMissionDetailPageDTO;
 import com.diagbot.entity.StdMissionDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.StdMissionDetailPageVO;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author wangfeng

+ 2 - 2
mrman-service/src/main/java/com/diagbot/mapper/StdMissionInfoMapper.java

@@ -1,14 +1,14 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.StdMissionInfoPageDTO;
 import com.diagbot.entity.StdMissionInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.StdMissionInfoPageVO;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author wangfeng

+ 2 - 2
mrman-service/src/main/java/com/diagbot/service/StdMissionDetailService.java

@@ -1,14 +1,14 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.StdMissionDetailPageDTO;
 import com.diagbot.entity.StdMissionDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.StdMissionDetailPageVO;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author wangfeng

+ 2 - 2
mrman-service/src/main/java/com/diagbot/service/StdMissionInfoService.java

@@ -1,14 +1,14 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.StdMissionInfoPageDTO;
 import com.diagbot.entity.StdMissionInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.StdMissionInfoPageVO;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author wangfeng

+ 2 - 2
mrman-service/src/main/java/com/diagbot/service/impl/StdMissionDetailServiceImpl.java

@@ -1,17 +1,17 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.StdMissionDetailPageDTO;
 import com.diagbot.entity.StdMissionDetail;
 import com.diagbot.mapper.StdMissionDetailMapper;
 import com.diagbot.service.StdMissionDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.StdMissionDetailPageVO;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author wangfeng

+ 2 - 2
mrman-service/src/main/java/com/diagbot/service/impl/StdMissionInfoServiceImpl.java

@@ -1,17 +1,17 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.StdMissionInfoPageDTO;
 import com.diagbot.entity.StdMissionInfo;
 import com.diagbot.mapper.StdMissionInfoMapper;
 import com.diagbot.service.StdMissionInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.StdMissionInfoPageVO;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author wangfeng

+ 1 - 1
mrman-service/src/main/java/com/diagbot/web/StdMissionDetailController.java

@@ -41,7 +41,7 @@ public class StdMissionDetailController {
             notes = "分页获取任务详情信息")
     @PostMapping("/getMissionDetailPage")
     @SysLogger("getMissionDetailPage")
-    public RespDTO<IPage<StdMissionDetailPageDTO>> getMissionDetailPage(@RequestBody @Valid  StdMissionDetailPageVO stdQcresultTaskPageVO) {
+    public RespDTO<IPage<StdMissionDetailPageDTO>> getMissionDetailPage(@RequestBody @Valid StdMissionDetailPageVO stdQcresultTaskPageVO) {
         IPage<StdMissionDetailPageDTO> data = stdMissionDetailFacade.getMissionDetailPages(stdQcresultTaskPageVO);
         return RespDTO.onSuc(data);
     }

+ 2 - 6
mrman-service/src/main/java/com/diagbot/web/StdMissionInfoController.java

@@ -4,11 +4,8 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.StdMissionDetailPageDTO;
 import com.diagbot.dto.StdMissionInfoPageDTO;
-import com.diagbot.facade.StdMissionDetailFacade;
 import com.diagbot.facade.StdMissionInfoFacade;
-import com.diagbot.vo.StdMissionDetailPageVO;
 import com.diagbot.vo.StdMissionInfoClearVO;
 import com.diagbot.vo.StdMissionInfoPageVO;
 import com.diagbot.vo.StdMissionInfoUpVO;
@@ -18,13 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wangfeng
@@ -45,6 +40,7 @@ public class StdMissionInfoController {
         IPage<StdMissionInfoPageDTO> data = stdMissionInfoFacade.getMissionInfoPages(stdMissionInfoPageVO);
         return RespDTO.onSuc(data);
     }
+
     @ApiOperation(value = "修改获取任务信息[by:wangfeng]",
             notes = "修改获取任务信息")
     @PostMapping("/updataMissionInfo")