微调

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/ImsWplanController.java

@@ -12,7 +12,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.iost.ims.entity.ImsDept;
 import org.jeecg.modules.iost.ims.entity.ImsWplan;
 import org.jeecg.modules.iost.ims.service.IImsWplanService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,10 +26,10 @@ import java.util.Date;
 /**
  * @Description: ims生产订单基本信息
  * @Author: jeecg-boot
- * @Date:   2021-09-13
+ * @Date: 2021-09-13
  * @Version: V1.0
  */
-@Api(tags="工单基本信息")
+@Api(tags = "工单基本信息")
 @RestController
 @RequestMapping("/imsWplan")
 @Slf4j
@@ -38,6 +37,7 @@ public class ImsWplanController extends JeecgController<ImsWplan, IImsWplanServi
 
     @Autowired
     IImsWplanService iImsWplanService;
+
     /**
      * 分页列表查询
      *
@@ -48,16 +48,16 @@ public class ImsWplanController extends JeecgController<ImsWplan, IImsWplanServi
      * @return
      */
     @AutoLog(value = "ims工单-分页列表查询")
-    @ApiOperation(value="ims工单-分页列表查询", notes="ims工单-分页列表查询")
+    @ApiOperation(value = "ims工单-分页列表查询", notes = "ims工单-分页列表查询")
     @GetMapping(value = "/list")
     public Result<?> queryPageList(ImsWplan imsWplan,
-                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                   HttpServletRequest req,String date) {
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req, String date) {
         QueryWrapper<ImsWplan> queryWrapper = QueryGenerator.initQueryWrapper(imsWplan, req.getParameterMap()).orderByDesc("create_time");
         Page<ImsWplan> page = new Page<ImsWplan>(pageNo, pageSize);
-        if(!"null".equals(date)){
-            SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd" );
+        if (!"null".equals(date)) {
+            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
             Date parse = null;
             try {
                 parse = sdf1.parse(date);
@@ -67,24 +67,25 @@ public class ImsWplanController extends JeecgController<ImsWplan, IImsWplanServi
             //根据查询日期拿到明天
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(parse);
-            calendar.add(Calendar.DATE,1);
-            String parse1=sdf1.format(calendar.getTime());
-            queryWrapper.gt("create_time",parse);
-            queryWrapper.lt("create_time",parse1);
+            calendar.add(Calendar.DATE, 1);
+            String parse1 = sdf1.format(calendar.getTime());
+            queryWrapper.gt("create_time", parse);
+            queryWrapper.lt("create_time", parse1);
         }
         IPage<ImsWplan> pageList = iImsWplanService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
+
     /**
-     *   通过id删除
+     * 通过id删除
      *
      * @param id
      * @return
      */
     @AutoLog(value = "采购订单收料-通过id删除")
-    @ApiOperation(value="采购订单收料-通过id删除", notes="采购订单收料-通过id删除")
+    @ApiOperation(value = "采购订单收料-通过id删除", notes = "采购订单收料-通过id删除")
     @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         iImsWplanService.removeById(id);
         return Result.OK("删除成功!");
     }
@@ -100,8 +101,8 @@ public class ImsWplanController extends JeecgController<ImsWplan, IImsWplanServi
     @PostMapping(value = "/synchronization")
     public Result<?> synchronization(@RequestBody String id) throws ParseException {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        Boolean flag=iImsWplanService.synchronization(id,sysUser);
-        if(flag){
+        Boolean flag = iImsWplanService.synchronization(id, null, sysUser);
+        if (flag) {
             return Result.OK("同步成功");
         }
         return Result.error("同步失败");