Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupController.java

@@ -10,6 +10,8 @@ import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGro
 import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupService;
+import cn.ezhizao.project.system.domain.SysDeptUser;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -93,6 +95,7 @@ public class BizProductionResourceGroupController extends BaseController
         String msg = "";
             for (BizProductionResourceGroupDetail item: bizProductionResourceGroup.getGroupDetailList()
             ) {
+                item.setDeptId(bizProductionResourceGroup.getDeptId());
                 item.setProductionResourceGroupId(bizProductionResourceGroup.getId());
                 //查询非当前资源组下是否该设备已经被绑定了
                 List<BizProductionResourceGroupDetail> equipmentList = bizProductionResourceGroupDetailService.query().ne("production_resource_group_id", bizProductionResourceGroup.getId()).eq("common_type", "equipmentDetail").eq("common_id", item.getCommonId()).list();
@@ -130,4 +133,5 @@ public class BizProductionResourceGroupController extends BaseController
     {
         return toAjax(bizProductionResourceGroupService.removeById(ids));
     }
+
 }

src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupDetailController.java

@@ -6,12 +6,16 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroup;
 import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
+import cn.ezhizao.project.system.domain.SysDeptUser;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,8 +26,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/business/detail")
-public class BizProductionResourceGroupDetailController extends BaseController
-{
+public class BizProductionResourceGroupDetailController extends BaseController {
     @Resource
     private IBizProductionResourceGroupDetailService bizProductionResourceGroupDetailService;
 
@@ -31,8 +34,7 @@ public class BizProductionResourceGroupDetailController extends BaseController
      * 查询工段资源组明细列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo list(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
         return getDataTable(list);
     }
@@ -41,8 +43,7 @@ public class BizProductionResourceGroupDetailController extends BaseController
      * 查询工段资源组明细列表
      */
     @GetMapping("/equipmentList")
-    public TableDataInfo EquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo EquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getEquipmentList(bizProductionResourceGroupDetail);
         return getDataTable(list);
     }
@@ -52,8 +53,7 @@ public class BizProductionResourceGroupDetailController extends BaseController
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public void export(HttpServletResponse response, BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
         ExcelUtil<BizProductionResourceGroupDetail> util = new ExcelUtil<BizProductionResourceGroupDetail>(BizProductionResourceGroupDetail.class);
         util.exportExcel(response, list, "工段资源组明细数据");
@@ -63,8 +63,7 @@ public class BizProductionResourceGroupDetailController extends BaseController
      * 获取工段资源组明细详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizProductionResourceGroupDetailService.getById(id));
     }
 
@@ -73,8 +72,7 @@ public class BizProductionResourceGroupDetailController extends BaseController
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult add(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
 
         return toAjax(bizProductionResourceGroupDetailService.save(bizProductionResourceGroupDetail));
     }
@@ -84,8 +82,7 @@ public class BizProductionResourceGroupDetailController extends BaseController
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult edit(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
 
         return toAjax(bizProductionResourceGroupDetailService.updateById(bizProductionResourceGroupDetail));
     }
@@ -94,9 +91,33 @@ public class BizProductionResourceGroupDetailController extends BaseController
      * 删除工段资源组明细
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long ids) {
         return toAjax(bizProductionResourceGroupDetailService.removeById(ids));
     }
-}
+
+    /**
+     * 删除工段资源组(当删除部门人员时，执行删除操作）
+     */
+    @Log(title = "工段资源组", businessType = BusinessType.DELETE)
+    @PostMapping("/deleteGroupDetail")
+    public AjaxResult deleteGroupDetail(@RequestBody List<SysDeptUser> deptUserList) {
+        QueryWrapper<BizProductionResourceGroupDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dept_id", deptUserList.get(0).getDeptId());
+        queryWrapper.and(wrapper -> {
+            for (SysDeptUser deptUser : deptUserList) {
+                wrapper.or().eq("common_id", deptUser.getUserId());
+            }
+
+        });
+        List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.list(queryWrapper);
+        if(list.size() > 0) {
+            List<Long> ids = new ArrayList<>();
+            for (BizProductionResourceGroupDetail bizProductionResourceGroupDetail : list) {
+                ids.add(bizProductionResourceGroupDetail.getId());
+            }
+            return toAjax(bizProductionResourceGroupDetailService.removeBatchByIds(ids));
+            }
+        return success();
+    }
+}

src/main/java/cn/ezhizao/project/business/resourceGroup/domain/BizProductionResourceGroupDetail.java

@@ -34,8 +34,9 @@ public class BizProductionResourceGroupDetail extends BaseEntity
     private String commonType;
     /** 资源类型 */
     private String commonName;
+
     /** 设备使用部门 */
-    @ApiModelProperty(value = "设备编码")
+    @ApiModelProperty(value = "部门")
     private Long deptId;
     @TableField(exist = false)
     private String resourceCode;

src/main/resources/mybatis/business/product/BizProductMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="specification != null  and specification != ''"> AND specification LIKE CONCAT('%', #{specification}, '%')</if>
             <if test="drawingNumber != null  and drawingNumber != ''"> AND drawing_number LIKE CONCAT('%',#{drawingNumber},'%')</if>
             <if test="companyAlias != null  and companyAlias != ''">  AND company_alias LIKE CONCAT('%', #{companyAlias}, '%')</if>
-            <if test="description != null  and description != ''"> AND description = #{description}</if>
+            <if test="description != null  and description != ''"> AND description like concat('%',#{description},'%')</if>
             <if test="diameter != null "> AND diameter = #{diameter}</if>
             <if test="lenght != null "> AND lenght = #{lenght}</if>
             <if test="thickness != null "> AND thickness = #{thickness}</if>

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -105,7 +105,7 @@
 		       u.create_by,
 		       u.create_time,
 		       u.remark FROM sys_user u left join sys_dept_user d on u.user_id = d.user_id
-		WHERE u.del_flag = '0'
+		WHERE u.del_flag = '0' and d.deleted = 0
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>