From 5be9e8d18b4b8c5391d15c4f1f94b9095541ec0a Mon Sep 17 00:00:00 2001 From: baogq Date: Thu, 29 Oct 2020 19:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BA=A4=E6=8E=A5=E7=8F=AD?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseinfo/BasePlanInfoController.java | 34 +++- .../BasePlandetailInfoController.java | 9 +- .../BaseShiftdetailInfoController.java | 126 ++++++++++++ .../BaseShiftmasterInfoController.java | 149 ++++++++++++++ .../baseinfo/plandetailinfo/edit.html | 25 +-- .../plandetailinfo/plandetailinfo.html | 39 ++-- .../templates/baseinfo/planinfo/planinfo.html | 70 +++++-- .../baseinfo/shiftdetailinfo/add.html | 40 ++++ .../baseinfo/shiftdetailinfo/edit.html | 35 ++++ .../shiftdetailinfo/shiftdetailinfo.html | 107 ++++++++++ .../baseinfo/shiftmasterinfo/add.html | 81 ++++++++ .../baseinfo/shiftmasterinfo/edit.html | 85 ++++++++ .../shiftmasterinfo/shiftmasterinfo.html | 192 ++++++++++++++++++ .../ruoyi/baseinfo/domain/BaseGroupInfo.java | 4 + .../baseinfo/domain/BaseMaterialInfo.java | 2 + .../ruoyi/baseinfo/domain/BasePlanInfo.java | 14 ++ .../baseinfo/domain/BasePlandetailInfo.java | 14 ++ .../baseinfo/domain/BaseShiftdetailInfo.java | 104 ++++++++++ .../baseinfo/domain/BaseShiftmasterInfo.java | 149 ++++++++++++++ .../baseinfo/mapper/BasePlanInfoMapper.java | 2 + .../mapper/BasePlandetailInfoMapper.java | 4 + .../mapper/BaseShiftdetailInfoMapper.java | 61 ++++++ .../mapper/BaseShiftmasterInfoMapper.java | 61 ++++++ .../service/IBaseGroupInfoService.java | 2 + .../service/IBaseMaterialInfoService.java | 2 + .../service/IBasePlanInfoService.java | 2 + .../service/IBasePlandetailInfoService.java | 5 + .../service/IBaseShiftdetailInfoService.java | 61 ++++++ .../service/IBaseShiftmasterInfoService.java | 61 ++++++ .../impl/BaseGroupInfoServiceImpl.java | 15 ++ .../impl/BaseMaterialInfoServiceImpl.java | 15 ++ .../service/impl/BasePlanInfoServiceImpl.java | 6 + .../impl/BasePlandetailInfoServiceImpl.java | 12 ++ .../impl/BaseShiftdetailInfoServiceImpl.java | 97 +++++++++ .../impl/BaseShiftmasterInfoServiceImpl.java | 97 +++++++++ .../mapper/baseinfo/BasePlanInfoMapper.xml | 30 ++- .../baseinfo/BasePlandetailInfoMapper.xml | 26 ++- .../baseinfo/BaseShiftdetailInfoMapper.xml | 95 +++++++++ .../baseinfo/BaseShiftmasterInfoMapper.xml | 114 +++++++++++ 39 files changed, 1977 insertions(+), 70 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftdetailInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftmasterInfoController.java create mode 100644 ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/shiftdetailinfo.html create mode 100644 ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/shiftmasterinfo.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftdetailInfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftmasterInfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftdetailInfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftmasterInfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftdetailInfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftmasterInfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftdetailInfoServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftmasterInfoServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftdetailInfoMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftmasterInfoMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlanInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlanInfoController.java index 4cf53e6..343289f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlanInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlanInfoController.java @@ -5,11 +5,8 @@ import java.util.Date; import java.util.List; import java.util.Random; -import com.ruoyi.baseinfo.domain.BaseDeviceInfo; -import com.ruoyi.baseinfo.domain.BaseShiftInfo; -import com.ruoyi.baseinfo.service.IBaseDeviceInfoService; -import com.ruoyi.baseinfo.service.IBasePlandetailInfoService; -import com.ruoyi.baseinfo.service.IBaseShiftInfoService; +import com.ruoyi.baseinfo.domain.*; +import com.ruoyi.baseinfo.service.*; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.framework.util.ShiroUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -23,8 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.baseinfo.domain.BasePlanInfo; -import com.ruoyi.baseinfo.service.IBasePlanInfoService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -50,6 +45,10 @@ public class BasePlanInfoController extends BaseController private IBaseShiftInfoService baseShiftInfoService; @Autowired private IBasePlandetailInfoService basePlandetailInfoService; + @Autowired + private IBaseMaterialInfoService baseMaterialInfoService; + @Autowired + private IBaseGroupInfoService baseGroupInfoService; @RequiresPermissions("baseinfo:planinfo:view") @GetMapping() @@ -153,7 +152,28 @@ public class BasePlanInfoController extends BaseController @ResponseBody public AjaxResult remove(String ids) { + basePlandetailInfoService.deleteBasePlandetailInfoByPlanIds(ids); return toAjax(basePlanInfoService.deleteBasePlanInfoByIds(ids)); } + /** + * 查询详细计划详请 + */ + @RequiresPermissions("baseinfo:planchildinfo:list") + @GetMapping("/detail/{planid}") + public String detail(@PathVariable("planid") String planid, ModelMap mmap) + { + BasePlanInfo basePlanInfo = new BasePlanInfo(); + BaseMaterialInfo baseMaterialInfo = new BaseMaterialInfo(); + + mmap.put("planDetailInfo", basePlanInfoService.selectBasePlanInfoListByPlanID(planid)); + + mmap.put("cbmaterialinfo", baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo)); + + BaseGroupInfo baseGroupInfo = new BaseGroupInfo(); + mmap.put("cbGroupInfo", baseGroupInfoService.selectBaseGroupInfoList(baseGroupInfo)); + + mmap.put("planInfoList", basePlanInfoService.selectBasePlanInfoList(basePlanInfo)); + return "baseinfo/plandetailinfo/plandetailinfo"; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlandetailInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlandetailInfoController.java index f180056..92c1d26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlandetailInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BasePlandetailInfoController.java @@ -50,8 +50,10 @@ public class BasePlandetailInfoController extends BaseController @RequiresPermissions("baseinfo:plandetailinfo:view") @GetMapping() - public String plandetailinfo() + public String plandetailinfo(ModelMap mmap) { +// BaseMaterialInfo baseMaterialInfo = new BaseMaterialInfo(); +// mmap.put("cbmaterialinfo", baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo)); return prefix + "/plandetailinfo"; } @@ -111,6 +113,8 @@ public class BasePlandetailInfoController extends BaseController public String edit(@PathVariable("objid") Long objid, ModelMap mmap) { BasePlandetailInfo basePlandetailInfo = basePlandetailInfoService.selectBasePlandetailInfoById(objid); + mmap.put("cbMaterialinfo", baseMaterialInfoService.selectEditBaseMaterialInfoList(basePlandetailInfo.getMaterialId())); + mmap.put("cbGroupInfo", baseGroupInfoService.selectEditBaseGroupInfoList(basePlandetailInfo.getGroupId())); mmap.put("basePlandetailInfo", basePlandetailInfo); return prefix + "/edit"; } @@ -145,8 +149,6 @@ public class BasePlandetailInfoController extends BaseController @GetMapping("/plandetail/{planid}") public String planedit(@PathVariable("planid") String planid, ModelMap mmap) { -// BasePlanInfo basePlanInfo = basePlanInfoService.selectBasePlanInfoById(planid); -// mmap.put("basePlanInfo", basePlanInfo); BaseMaterialInfo baseMaterialInfo = new BaseMaterialInfo(); BaseGroupInfo baseGroupInfo = new BaseGroupInfo(); mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo)); @@ -155,4 +157,5 @@ public class BasePlandetailInfoController extends BaseController mmap.put("planid", planid); return prefix + "/add"; } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftdetailInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftdetailInfoController.java new file mode 100644 index 0000000..fe5c0ac --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftdetailInfoController.java @@ -0,0 +1,126 @@ +package com.ruoyi.web.controller.baseinfo; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo; +import com.ruoyi.baseinfo.service.IBaseShiftdetailInfoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 交接班详情信息Controller + * + * @author CaesarBao + * @date 2020-10-28 + */ +@Controller +@RequestMapping("/baseinfo/shiftdetailinfo") +public class BaseShiftdetailInfoController extends BaseController +{ + private String prefix = "baseinfo/shiftdetailinfo"; + + @Autowired + private IBaseShiftdetailInfoService baseShiftdetailInfoService; + + @RequiresPermissions("baseinfo:shiftdetailinfo:view") + @GetMapping() + public String shiftdetailinfo() + { + return prefix + "/shiftdetailinfo"; + } + + /** + * 查询交接班详情信息列表 + */ + @RequiresPermissions("baseinfo:shiftdetailinfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseShiftdetailInfo baseShiftdetailInfo) + { + startPage(); + List list = baseShiftdetailInfoService.selectBaseShiftdetailInfoList(baseShiftdetailInfo); + return getDataTable(list); + } + + /** + * 导出交接班详情信息列表 + */ + @RequiresPermissions("baseinfo:shiftdetailinfo:export") + @Log(title = "交接班详情信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseShiftdetailInfo baseShiftdetailInfo) + { + List list = baseShiftdetailInfoService.selectBaseShiftdetailInfoList(baseShiftdetailInfo); + ExcelUtil util = new ExcelUtil(BaseShiftdetailInfo.class); + return util.exportExcel(list, "shiftdetailinfo"); + } + + /** + * 新增交接班详情信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存交接班详情信息 + */ + @RequiresPermissions("baseinfo:shiftdetailinfo:add") + @Log(title = "交接班详情信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseShiftdetailInfo baseShiftdetailInfo) + { + return toAjax(baseShiftdetailInfoService.insertBaseShiftdetailInfo(baseShiftdetailInfo)); + } + + /** + * 修改交接班详情信息 + */ + @GetMapping("/edit/{shiftNo}") + public String edit(@PathVariable("shiftNo") String shiftNo, ModelMap mmap) + { + BaseShiftdetailInfo baseShiftdetailInfo = baseShiftdetailInfoService.selectBaseShiftdetailInfoById(shiftNo); + mmap.put("baseShiftdetailInfo", baseShiftdetailInfo); + return prefix + "/edit"; + } + + /** + * 修改保存交接班详情信息 + */ + @RequiresPermissions("baseinfo:shiftdetailinfo:edit") + @Log(title = "交接班详情信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseShiftdetailInfo baseShiftdetailInfo) + { + return toAjax(baseShiftdetailInfoService.updateBaseShiftdetailInfo(baseShiftdetailInfo)); + } + + /** + * 删除交接班详情信息 + */ + @RequiresPermissions("baseinfo:shiftdetailinfo:remove") + @Log(title = "交接班详情信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseShiftdetailInfoService.deleteBaseShiftdetailInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftmasterInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftmasterInfoController.java new file mode 100644 index 0000000..c71e8ed --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/baseinfo/BaseShiftmasterInfoController.java @@ -0,0 +1,149 @@ +package com.ruoyi.web.controller.baseinfo; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import com.ruoyi.baseinfo.domain.BaseDeviceInfo; +import com.ruoyi.baseinfo.domain.BaseGroupInfo; +import com.ruoyi.baseinfo.domain.BaseShiftInfo; +import com.ruoyi.baseinfo.service.IBaseDeviceInfoService; +import com.ruoyi.baseinfo.service.IBaseGroupInfoService; +import com.ruoyi.baseinfo.service.IBaseShiftInfoService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo; +import com.ruoyi.baseinfo.service.IBaseShiftmasterInfoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 交接班基础信息Controller + * + * @author CaesarBao + * @date 2020-10-28 + */ +@Controller +@RequestMapping("/baseinfo/shiftmasterinfo") +public class BaseShiftmasterInfoController extends BaseController +{ + private String prefix = "baseinfo/shiftmasterinfo"; + + @Autowired + private IBaseShiftmasterInfoService baseShiftmasterInfoService; + @Autowired + private IBaseDeviceInfoService baseDeviceInfoService; + @Autowired + private IBaseShiftInfoService baseShiftInfoService; + @Autowired + private IBaseGroupInfoService baseGroupInfoService; + + @RequiresPermissions("baseinfo:shiftmasterinfo:view") + @GetMapping() + public String shiftmasterinfo(ModelMap mmap) + { + BaseDeviceInfo baseDeviceInfo = new BaseDeviceInfo(); + BaseShiftInfo baseShiftInfo = new BaseShiftInfo(); + BaseGroupInfo baseGroupInfo = new BaseGroupInfo(); + mmap.put("cbdeviceInfo",baseDeviceInfoService.selectBaseDeviceInfoList(baseDeviceInfo)); + mmap.put("cbshitfInfo",baseShiftInfoService.selectBaseShiftInfoList(baseShiftInfo)); + mmap.put("cbgroupInfo",baseGroupInfoService.selectBaseGroupInfoList(baseGroupInfo)); + return prefix + "/shiftmasterinfo"; + } + + /** + * 查询交接班基础信息列表 + */ + @RequiresPermissions("baseinfo:shiftmasterinfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseShiftmasterInfo baseShiftmasterInfo) + { + startPage(); + List list = baseShiftmasterInfoService.selectBaseShiftmasterInfoList(baseShiftmasterInfo); + return getDataTable(list); + } + + /** + * 导出交接班基础信息列表 + */ + @RequiresPermissions("baseinfo:shiftmasterinfo:export") + @Log(title = "交接班基础信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseShiftmasterInfo baseShiftmasterInfo) + { + List list = baseShiftmasterInfoService.selectBaseShiftmasterInfoList(baseShiftmasterInfo); + ExcelUtil util = new ExcelUtil(BaseShiftmasterInfo.class); + return util.exportExcel(list, "shiftmasterinfo"); + } + + /** + * 新增交接班基础信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存交接班基础信息 + */ + @RequiresPermissions("baseinfo:shiftmasterinfo:add") + @Log(title = "交接班基础信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseShiftmasterInfo baseShiftmasterInfo) + { + String code = new SimpleDateFormat("yyMMddHHmmss").format(new Date()); + baseShiftmasterInfo.setShiftNo(code); + return toAjax(baseShiftmasterInfoService.insertBaseShiftmasterInfo(baseShiftmasterInfo)); + } + + /** + * 修改交接班基础信息 + */ + @GetMapping("/edit/{shiftNo}") + public String edit(@PathVariable("shiftNo") String shiftNo, ModelMap mmap) + { + BaseShiftmasterInfo baseShiftmasterInfo = baseShiftmasterInfoService.selectBaseShiftmasterInfoById(shiftNo); + mmap.put("baseShiftmasterInfo", baseShiftmasterInfo); + return prefix + "/edit"; + } + + /** + * 修改保存交接班基础信息 + */ + @RequiresPermissions("baseinfo:shiftmasterinfo:edit") + @Log(title = "交接班基础信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseShiftmasterInfo baseShiftmasterInfo) + { + return toAjax(baseShiftmasterInfoService.updateBaseShiftmasterInfo(baseShiftmasterInfo)); + } + + /** + * 删除交接班基础信息 + */ + @RequiresPermissions("baseinfo:shiftmasterinfo:remove") + @Log(title = "交接班基础信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseShiftmasterInfoService.deleteBaseShiftmasterInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/baseinfo/plandetailinfo/edit.html b/ruoyi-admin/src/main/resources/templates/baseinfo/plandetailinfo/edit.html index 05e8a4c..96c2d0a 100644 --- a/ruoyi-admin/src/main/resources/templates/baseinfo/plandetailinfo/edit.html +++ b/ruoyi-admin/src/main/resources/templates/baseinfo/plandetailinfo/edit.html @@ -2,6 +2,8 @@ + +
@@ -14,21 +16,11 @@
- +
- + - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性
@@ -54,10 +46,9 @@
- + - 代码生成请选择字典属性
@@ -72,6 +63,8 @@
+ + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/add.html b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/add.html new file mode 100644 index 0000000..441fb5f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/add.html @@ -0,0 +1,40 @@ + + + + + + +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/edit.html b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/edit.html new file mode 100644 index 0000000..b5b2732 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/edit.html @@ -0,0 +1,35 @@ + + + + + + +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/shiftdetailinfo.html b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/shiftdetailinfo.html new file mode 100644 index 0000000..dce76ac --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftdetailinfo/shiftdetailinfo.html @@ -0,0 +1,107 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/add.html b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/add.html new file mode 100644 index 0000000..eff77aa --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/add.html @@ -0,0 +1,81 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/edit.html b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/edit.html new file mode 100644 index 0000000..685c922 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/edit.html @@ -0,0 +1,85 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/shiftmasterinfo.html b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/shiftmasterinfo.html new file mode 100644 index 0000000..48411cb --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseinfo/shiftmasterinfo/shiftmasterinfo.html @@ -0,0 +1,192 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseGroupInfo.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseGroupInfo.java index 9bebd14..083dddf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseGroupInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseGroupInfo.java @@ -1,5 +1,6 @@ package com.ruoyi.baseinfo.domain; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author CasearBao * @date 2020-10-21 */ +@Data public class BaseGroupInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -33,6 +35,8 @@ public class BaseGroupInfo extends BaseEntity /** 删除标志（0代表存在 1代表删除） */ private String delFlag; + private boolean flag = false; + public void setObjid(Long objid) { this.objid = objid; diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseMaterialInfo.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseMaterialInfo.java index 1e3dba0..e66f65a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseMaterialInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseMaterialInfo.java @@ -43,6 +43,8 @@ public class BaseMaterialInfo extends BaseEntity /** 删除标志（0代表存在 1代表删除） */ private String delFlag; + private boolean flag = false; + private String materialTypeName; public void setObjid(Long objid) diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlanInfo.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlanInfo.java index 1578594..2fc1ecf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlanInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlanInfo.java @@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 计划信息对象 base_plan_info * @@ -44,6 +46,18 @@ public class BasePlanInfo extends BaseEntity private String shiftname; + private String groupname; + + /** 起始时间 */ + @Excel(name = "起始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 结束时间 */ + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date overTime; + + private BasePlandetailInfo planDetailInfo; + public void setPlanid(String planid) { this.planid = planid; diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlandetailInfo.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlandetailInfo.java index effc88c..7663144 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlandetailInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BasePlandetailInfo.java @@ -1,16 +1,20 @@ package com.ruoyi.baseinfo.domain; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 计划明细对象 base_plandetail_info * * @author CaesarBao * @date 2020-10-23 */ +@Data public class BasePlandetailInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -49,6 +53,16 @@ public class BasePlandetailInfo extends BaseEntity /** 删除标志（0代表存在 1代表删除） */ private String delFlag; + private String groupname; + + /** 起始时间 */ + @Excel(name = "起始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 结束时间 */ + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date overTime; + public void setObjid(Long objid) { this.objid = objid; diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftdetailInfo.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftdetailInfo.java new file mode 100644 index 0000000..64ac496 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftdetailInfo.java @@ -0,0 +1,104 @@ +package com.ruoyi.baseinfo.domain; + +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 交接班详情信息对象 base_shiftdetail_info + * + * @author CaesarBao + * @date 2020-10-28 + */ +@Data +public class BaseShiftdetailInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 交接班编号 */ + @Excel(name = "交接班编号") + private String shiftNo; + + /** 职位ID */ + @Excel(name = "职位ID") + private String postId; + + /** 交接班人员ID */ + @Excel(name = "交接班人员ID") + private String empId; + + /** 状态标志（0代表可用 1代表停用） */ + @Excel(name = "状态标志", readConverterExp = "0=代表可用,1=代表停用") + private String status; + + /** 删除标志（0代表存在 1代表删除） */ + private String delFlag; + + private String postName; + + private String empName; + + public void setShiftNo(String shiftNo) + { + this.shiftNo = shiftNo; + } + + public String getShiftNo() + { + return shiftNo; + } + public void setPostId(String postId) + { + this.postId = postId; + } + + public String getPostId() + { + return postId; + } + public void setEmpId(String empId) + { + this.empId = empId; + } + + public String getEmpId() + { + return empId; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("shiftNo", getShiftNo()) + .append("postId", getPostId()) + .append("empId", getEmpId()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftmasterInfo.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftmasterInfo.java new file mode 100644 index 0000000..fbb6a99 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/domain/BaseShiftmasterInfo.java @@ -0,0 +1,149 @@ +package com.ruoyi.baseinfo.domain; + +import java.util.Date; + +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 交接班基础信息对象 base_shiftmaster_info + * + * @author CaesarBao + * @date 2020-10-28 + */ +@Data +public class BaseShiftmasterInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 交接班编号 */ + private String shiftNo; + + /** 基台设备ID */ + @Excel(name = "基台设备ID") + private String deviceId; + + /** 班次ID */ + @Excel(name = "班次ID") + private String shiftId; + + /** 班组ID */ + @Excel(name = "班组ID") + private String groupId; + + /** 起始时间 */ + @Excel(name = "起始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 结束时间 */ + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date overTime; + + /** 状态标志（0代表可用 1代表停用） */ + @Excel(name = "状态标志", readConverterExp = "0=代表可用,1=代表停用") + private String status; + + /** 删除标志（0代表存在 1代表删除） */ + private String delFlag; + + private String deviceName; + + private String shiftname; + + private String groupname; + + public void setShiftNo(String shiftNo) + { + this.shiftNo = shiftNo; + } + + public String getShiftNo() + { + return shiftNo; + } + public void setDeviceId(String deviceId) + { + this.deviceId = deviceId; + } + + public String getDeviceId() + { + return deviceId; + } + public void setShiftId(String shiftId) + { + this.shiftId = shiftId; + } + + public String getShiftId() + { + return shiftId; + } + public void setGroupId(String groupId) + { + this.groupId = groupId; + } + + public String getGroupId() + { + return groupId; + } + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStartTime() + { + return startTime; + } + public void setOverTime(Date overTime) + { + this.overTime = overTime; + } + + public Date getOverTime() + { + return overTime; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("shiftNo", getShiftNo()) + .append("deviceId", getDeviceId()) + .append("shiftId", getShiftId()) + .append("groupId", getGroupId()) + .append("startTime", getStartTime()) + .append("overTime", getOverTime()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlanInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlanInfoMapper.java index 4d839fd..d3a06bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlanInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlanInfoMapper.java @@ -58,4 +58,6 @@ public interface BasePlanInfoMapper * @return 结果 */ public int deleteBasePlanInfoByIds(String[] planids); + + public BasePlanInfo selectBasePlanInfoListByPlanID(String planid); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlandetailInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlandetailInfoMapper.java index 3b81d8d..fc7ca6f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlandetailInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BasePlandetailInfoMapper.java @@ -58,4 +58,8 @@ public interface BasePlandetailInfoMapper * @return 结果 */ public int deleteBasePlandetailInfoByIds(String[] objids); + + public int deleteBasePlandetailInfoByPlanIds(String[] objids); + + public BasePlandetailInfo selectBasePlandetailInfoByPlanID(String planid); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftdetailInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftdetailInfoMapper.java new file mode 100644 index 0000000..ed18d70 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftdetailInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.baseinfo.mapper; + +import java.util.List; +import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo; + +/** + * 交接班详情信息Mapper接口 + * + * @author CaesarBao + * @date 2020-10-28 + */ +public interface BaseShiftdetailInfoMapper +{ + /** + * 查询交接班详情信息 + * + * @param shiftNo 交接班详情信息ID + * @return 交接班详情信息 + */ + public BaseShiftdetailInfo selectBaseShiftdetailInfoById(String shiftNo); + + /** + * 查询交接班详情信息列表 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 交接班详情信息集合 + */ + public List selectBaseShiftdetailInfoList(BaseShiftdetailInfo baseShiftdetailInfo); + + /** + * 新增交接班详情信息 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 结果 + */ + public int insertBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo); + + /** + * 修改交接班详情信息 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 结果 + */ + public int updateBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo); + + /** + * 删除交接班详情信息 + * + * @param shiftNo 交接班详情信息ID + * @return 结果 + */ + public int deleteBaseShiftdetailInfoById(String shiftNo); + + /** + * 批量删除交接班详情信息 + * + * @param shiftNos 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseShiftdetailInfoByIds(String[] shiftNos); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftmasterInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftmasterInfoMapper.java new file mode 100644 index 0000000..ab2172f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/mapper/BaseShiftmasterInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.baseinfo.mapper; + +import java.util.List; +import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo; + +/** + * 交接班基础信息Mapper接口 + * + * @author CaesarBao + * @date 2020-10-28 + */ +public interface BaseShiftmasterInfoMapper +{ + /** + * 查询交接班基础信息 + * + * @param shiftNo 交接班基础信息ID + * @return 交接班基础信息 + */ + public BaseShiftmasterInfo selectBaseShiftmasterInfoById(String shiftNo); + + /** + * 查询交接班基础信息列表 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 交接班基础信息集合 + */ + public List selectBaseShiftmasterInfoList(BaseShiftmasterInfo baseShiftmasterInfo); + + /** + * 新增交接班基础信息 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 结果 + */ + public int insertBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo); + + /** + * 修改交接班基础信息 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 结果 + */ + public int updateBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo); + + /** + * 删除交接班基础信息 + * + * @param shiftNo 交接班基础信息ID + * @return 结果 + */ + public int deleteBaseShiftmasterInfoById(String shiftNo); + + /** + * 批量删除交接班基础信息 + * + * @param shiftNos 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseShiftmasterInfoByIds(String[] shiftNos); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseGroupInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseGroupInfoService.java index a74ac21..9b6271e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseGroupInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseGroupInfoService.java @@ -58,4 +58,6 @@ public interface IBaseGroupInfoService * @return 结果 */ public int deleteBaseGroupInfoById(Long objid); + + public List selectEditBaseGroupInfoList(String groupid); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseMaterialInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseMaterialInfoService.java index decabbf..78999ab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseMaterialInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseMaterialInfoService.java @@ -58,4 +58,6 @@ public interface IBaseMaterialInfoService * @return 结果 */ public int deleteBaseMaterialInfoById(Long objid); + + public List selectEditBaseMaterialInfoList(String materialId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlanInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlanInfoService.java index 6a441b2..6d303f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlanInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlanInfoService.java @@ -58,4 +58,6 @@ public interface IBasePlanInfoService * @return 结果 */ public int deleteBasePlanInfoById(String planid); + + public BasePlanInfo selectBasePlanInfoListByPlanID(String planid); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlandetailInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlandetailInfoService.java index 904c101..4ec2d01 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlandetailInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBasePlandetailInfoService.java @@ -58,4 +58,9 @@ public interface IBasePlandetailInfoService * @return 结果 */ public int deleteBasePlandetailInfoById(Long objid); + + public int deleteBasePlandetailInfoByPlanIds(String ids); + + public BasePlandetailInfo selectBasePlandetailInfoByPlanID(String planid); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftdetailInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftdetailInfoService.java new file mode 100644 index 0000000..3640102 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftdetailInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.baseinfo.service; + +import java.util.List; +import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo; + +/** + * 交接班详情信息Service接口 + * + * @author CaesarBao + * @date 2020-10-28 + */ +public interface IBaseShiftdetailInfoService +{ + /** + * 查询交接班详情信息 + * + * @param shiftNo 交接班详情信息ID + * @return 交接班详情信息 + */ + public BaseShiftdetailInfo selectBaseShiftdetailInfoById(String shiftNo); + + /** + * 查询交接班详情信息列表 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 交接班详情信息集合 + */ + public List selectBaseShiftdetailInfoList(BaseShiftdetailInfo baseShiftdetailInfo); + + /** + * 新增交接班详情信息 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 结果 + */ + public int insertBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo); + + /** + * 修改交接班详情信息 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 结果 + */ + public int updateBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo); + + /** + * 批量删除交接班详情信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseShiftdetailInfoByIds(String ids); + + /** + * 删除交接班详情信息信息 + * + * @param shiftNo 交接班详情信息ID + * @return 结果 + */ + public int deleteBaseShiftdetailInfoById(String shiftNo); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftmasterInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftmasterInfoService.java new file mode 100644 index 0000000..332e23e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/IBaseShiftmasterInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.baseinfo.service; + +import java.util.List; +import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo; + +/** + * 交接班基础信息Service接口 + * + * @author CaesarBao + * @date 2020-10-28 + */ +public interface IBaseShiftmasterInfoService +{ + /** + * 查询交接班基础信息 + * + * @param shiftNo 交接班基础信息ID + * @return 交接班基础信息 + */ + public BaseShiftmasterInfo selectBaseShiftmasterInfoById(String shiftNo); + + /** + * 查询交接班基础信息列表 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 交接班基础信息集合 + */ + public List selectBaseShiftmasterInfoList(BaseShiftmasterInfo baseShiftmasterInfo); + + /** + * 新增交接班基础信息 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 结果 + */ + public int insertBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo); + + /** + * 修改交接班基础信息 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 结果 + */ + public int updateBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo); + + /** + * 批量删除交接班基础信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseShiftmasterInfoByIds(String ids); + + /** + * 删除交接班基础信息信息 + * + * @param shiftNo 交接班基础信息ID + * @return 结果 + */ + public int deleteBaseShiftmasterInfoById(String shiftNo); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseGroupInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseGroupInfoServiceImpl.java index 2b5e5dd..34eb211 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseGroupInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseGroupInfoServiceImpl.java @@ -94,4 +94,19 @@ public class BaseGroupInfoServiceImpl implements IBaseGroupInfoService { return baseGroupInfoMapper.deleteBaseGroupInfoById(objid); } + + @Override + public List selectEditBaseGroupInfoList(String groupid) + { + BaseGroupInfo baseGroupInfos = new BaseGroupInfo(); + List baseGroupInfoList = baseGroupInfoMapper.selectBaseGroupInfoList(baseGroupInfos); + for (BaseGroupInfo BaseGroupInfo:baseGroupInfoList + ) { + if(BaseGroupInfo.getGroupid().equals(groupid)){ + BaseGroupInfo.setFlag(true); + break; + } + } + return baseGroupInfoList; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseMaterialInfoServiceImpl.java index 176627c..378d5bd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseMaterialInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseMaterialInfoServiceImpl.java @@ -94,4 +94,19 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService { return baseMaterialInfoMapper.deleteBaseMaterialInfoById(objid); } + + @Override + public List selectEditBaseMaterialInfoList(String materialId) + { + BaseMaterialInfo baseMaterialInfos = new BaseMaterialInfo(); + List baseMaterialInfoList = baseMaterialInfoMapper.selectBaseMaterialInfoList(baseMaterialInfos); + for (BaseMaterialInfo baseMaterialInfo:baseMaterialInfoList + ) { + if(baseMaterialInfo.getMaterialId().equals(materialId)){ + baseMaterialInfo.setFlag(true); + break; + } + } + return baseMaterialInfoList; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlanInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlanInfoServiceImpl.java index eec89b4..d70a4a1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlanInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlanInfoServiceImpl.java @@ -94,4 +94,10 @@ public class BasePlanInfoServiceImpl implements IBasePlanInfoService { return basePlanInfoMapper.deleteBasePlanInfoById(planid); } + + @Override + public BasePlanInfo selectBasePlanInfoListByPlanID(String planid) + { + return basePlanInfoMapper.selectBasePlanInfoListByPlanID(planid); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlandetailInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlandetailInfoServiceImpl.java index 8c826fd..3dd5bb5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlandetailInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BasePlandetailInfoServiceImpl.java @@ -94,4 +94,16 @@ public class BasePlandetailInfoServiceImpl implements IBasePlandetailInfoService { return basePlandetailInfoMapper.deleteBasePlandetailInfoById(objid); } + + @Override + public int deleteBasePlandetailInfoByPlanIds(String ids) + { + return basePlandetailInfoMapper.deleteBasePlandetailInfoByPlanIds(Convert.toStrArray(ids)); + } + + @Override + public BasePlandetailInfo selectBasePlandetailInfoByPlanID(String planid) + { + return basePlandetailInfoMapper.selectBasePlandetailInfoByPlanID(planid); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftdetailInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftdetailInfoServiceImpl.java new file mode 100644 index 0000000..2470f2a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftdetailInfoServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.baseinfo.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.baseinfo.mapper.BaseShiftdetailInfoMapper; +import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo; +import com.ruoyi.baseinfo.service.IBaseShiftdetailInfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 交接班详情信息Service业务层处理 + * + * @author CaesarBao + * @date 2020-10-28 + */ +@Service +public class BaseShiftdetailInfoServiceImpl implements IBaseShiftdetailInfoService +{ + @Autowired + private BaseShiftdetailInfoMapper baseShiftdetailInfoMapper; + + /** + * 查询交接班详情信息 + * + * @param shiftNo 交接班详情信息ID + * @return 交接班详情信息 + */ + @Override + public BaseShiftdetailInfo selectBaseShiftdetailInfoById(String shiftNo) + { + return baseShiftdetailInfoMapper.selectBaseShiftdetailInfoById(shiftNo); + } + + /** + * 查询交接班详情信息列表 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 交接班详情信息 + */ + @Override + public List selectBaseShiftdetailInfoList(BaseShiftdetailInfo baseShiftdetailInfo) + { + return baseShiftdetailInfoMapper.selectBaseShiftdetailInfoList(baseShiftdetailInfo); + } + + /** + * 新增交接班详情信息 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 结果 + */ + @Override + public int insertBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo) + { + baseShiftdetailInfo.setCreateTime(DateUtils.getNowDate()); + return baseShiftdetailInfoMapper.insertBaseShiftdetailInfo(baseShiftdetailInfo); + } + + /** + * 修改交接班详情信息 + * + * @param baseShiftdetailInfo 交接班详情信息 + * @return 结果 + */ + @Override + public int updateBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo) + { + baseShiftdetailInfo.setUpdateTime(DateUtils.getNowDate()); + return baseShiftdetailInfoMapper.updateBaseShiftdetailInfo(baseShiftdetailInfo); + } + + /** + * 删除交接班详情信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBaseShiftdetailInfoByIds(String ids) + { + return baseShiftdetailInfoMapper.deleteBaseShiftdetailInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除交接班详情信息信息 + * + * @param shiftNo 交接班详情信息ID + * @return 结果 + */ + @Override + public int deleteBaseShiftdetailInfoById(String shiftNo) + { + return baseShiftdetailInfoMapper.deleteBaseShiftdetailInfoById(shiftNo); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftmasterInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftmasterInfoServiceImpl.java new file mode 100644 index 0000000..7d7e523 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/baseinfo/service/impl/BaseShiftmasterInfoServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.baseinfo.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.baseinfo.mapper.BaseShiftmasterInfoMapper; +import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo; +import com.ruoyi.baseinfo.service.IBaseShiftmasterInfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 交接班基础信息Service业务层处理 + * + * @author CaesarBao + * @date 2020-10-28 + */ +@Service +public class BaseShiftmasterInfoServiceImpl implements IBaseShiftmasterInfoService +{ + @Autowired + private BaseShiftmasterInfoMapper baseShiftmasterInfoMapper; + + /** + * 查询交接班基础信息 + * + * @param shiftNo 交接班基础信息ID + * @return 交接班基础信息 + */ + @Override + public BaseShiftmasterInfo selectBaseShiftmasterInfoById(String shiftNo) + { + return baseShiftmasterInfoMapper.selectBaseShiftmasterInfoById(shiftNo); + } + + /** + * 查询交接班基础信息列表 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 交接班基础信息 + */ + @Override + public List selectBaseShiftmasterInfoList(BaseShiftmasterInfo baseShiftmasterInfo) + { + return baseShiftmasterInfoMapper.selectBaseShiftmasterInfoList(baseShiftmasterInfo); + } + + /** + * 新增交接班基础信息 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 结果 + */ + @Override + public int insertBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo) + { + baseShiftmasterInfo.setCreateTime(DateUtils.getNowDate()); + return baseShiftmasterInfoMapper.insertBaseShiftmasterInfo(baseShiftmasterInfo); + } + + /** + * 修改交接班基础信息 + * + * @param baseShiftmasterInfo 交接班基础信息 + * @return 结果 + */ + @Override + public int updateBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo) + { + baseShiftmasterInfo.setUpdateTime(DateUtils.getNowDate()); + return baseShiftmasterInfoMapper.updateBaseShiftmasterInfo(baseShiftmasterInfo); + } + + /** + * 删除交接班基础信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBaseShiftmasterInfoByIds(String ids) + { + return baseShiftmasterInfoMapper.deleteBaseShiftmasterInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除交接班基础信息信息 + * + * @param shiftNo 交接班基础信息ID + * @return 结果 + */ + @Override + public int deleteBaseShiftmasterInfoById(String shiftNo) + { + return baseShiftmasterInfoMapper.deleteBaseShiftmasterInfoById(shiftNo); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlanInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlanInfoMapper.xml index 2f59975..c76beb8 100644 --- a/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlanInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlanInfoMapper.xml @@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -18,14 +20,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + - select planid, deviceid, plan_shift_id, plan_state_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_plan_info + select planid, deviceid, plan_shift_id, plan_state_id, start_time, over_time, status, remark, create_by, create_time, update_by, update_time, del_flag from base_plan_info + select t1.planid, t1.deviceid, t1.plan_shift_id, t1.plan_state_id, t1.start_time, t1.over_time,t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag,t2.objid,t2.material_id,t2.plan_amount,t2.real_amount,t2.unit_id,t2.group_id,t3.groupname from base_plan_info + t1 left join base_plandetail_info t2 on t1.planid = t2.planid + left join base_group_info t3 on t2.group_id = t3.groupid + where t1.planid = #{planid} + + diff --git a/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlandetailInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlandetailInfoMapper.xml index e253cc3..4b60132 100644 --- a/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlandetailInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/baseinfo/BasePlandetailInfoMapper.xml @@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -19,14 +21,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select objid, planid, material_id, plan_amount, real_amount, unit_id, group_id, remark, status, create_by, create_time, update_by, update_time, del_flag from base_plandetail_info + select objid, planid, material_id, plan_amount, real_amount, unit_id, group_id, start_time, over_time,remark, status, create_by, create_time, update_by, update_time, del_flag from base_plandetail_info + + where planid = #{planid} + + diff --git a/ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftdetailInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftdetailInfoMapper.xml new file mode 100644 index 0000000..b566e26 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftdetailInfoMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + select shift_no, post_id, emp_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_shiftdetail_info + + + + + + + + insert into base_shiftdetail_info + + shift_no, + post_id, + emp_id, + status, + remark, + create_by, + create_time, + update_by, + update_time, + del_flag, + + + #{shiftNo}, + #{postId}, + #{empId}, + #{status}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + + + + + update base_shiftdetail_info + + post_id = #{postId}, + emp_id = #{empId}, + status = #{status}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + + where shift_no = #{shiftNo} + + + + delete from base_shiftdetail_info where shift_no = #{shiftNo} + + + + delete from base_shiftdetail_info where shift_no in + + #{shiftNo} + + + + diff --git a/ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftmasterInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftmasterInfoMapper.xml new file mode 100644 index 0000000..283285b --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/baseinfo/BaseShiftmasterInfoMapper.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select shift_no, device_id, shift_id, group_id, start_time, over_time, status, remark, create_by, create_time, update_by, update_time, del_flag from base_shiftmaster_info + + + + + + + + insert into base_shiftmaster_info + + shift_no, + device_id, + shift_id, + group_id, + start_time, + over_time, + status, + remark, + create_by, + create_time, + update_by, + update_time, + del_flag, + + + #{shiftNo}, + #{deviceId}, + #{shiftId}, + #{groupId}, + #{startTime}, + #{overTime}, + #{status}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + + + + + update base_shiftmaster_info + + device_id = #{deviceId}, + shift_id = #{shiftId}, + group_id = #{groupId}, + start_time = #{startTime}, + over_time = #{overTime}, + status = #{status}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + + where shift_no = #{shiftNo} + + + + delete from base_shiftmaster_info where shift_no = #{shiftNo} + + + + delete from base_shiftmaster_info where shift_no in + + #{shiftNo} + + + +