工序保存

src/main/java/cn/ezhizao/project/business/technologicalProcess/controller/BizTechnologicalProcessController.java

@@ -44,8 +44,8 @@ public class BizTechnologicalProcessController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:technologicalProcess:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
-        String tenantId = request.getHeader("tenantId");
-        bizTechnologicalProcess.setTenantId(Long.valueOf(tenantId));
+//        String tenantId = request.getHeader("tenantId");
+//        bizTechnologicalProcess.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizTechnologicalProcess> list = bizTechnologicalProcessService.getList(bizTechnologicalProcess);
         return getDataTable(list);
@@ -80,8 +80,8 @@ public class BizTechnologicalProcessController extends BaseController {
     @Log(title = "工艺主表", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     public AjaxResult save(@RequestBody BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
-        String tenantId = request.getHeader("tenantId");
-        bizTechnologicalProcess.setTenantId(Long.valueOf(tenantId));
+//        String tenantId = request.getHeader("tenantId");
+//        bizTechnologicalProcess.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizTechnologicalProcessService.saveOrUpdate(bizTechnologicalProcess));
     }
 

src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/controller/BizTechnologicalProcessDetailController.java

@@ -40,8 +40,8 @@ public class BizTechnologicalProcessDetailController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     {
-        String tenantId = request.getHeader("tenantId");
-        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
+//        String tenantId = request.getHeader("tenantId");
+//        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizTechnologicalProcessDetail> list = bizTechnologicalProcessDetailService.getList(bizTechnologicalProcessDetail);
         return getDataTable(list);
@@ -79,11 +79,11 @@ public class BizTechnologicalProcessDetailController extends BaseController
     @PostMapping("/save")
     public AjaxResult save(@RequestBody List<BizTechnologicalProcessDetail> bizTechnologicalProcessDetail)
     {
-        String tenantId = request.getHeader("tenantId");
-        for (BizTechnologicalProcessDetail item : bizTechnologicalProcessDetail) {
-            item.setTenantId(Long.valueOf(tenantId));
-        }
-        List<BizTechnologicalProcessDetail> oldList = bizTechnologicalProcessDetailService.query().eq("technological_process_id", bizTechnologicalProcessDetail.get(0).getTechnologicalProcessId()).eq("tenant_id", Long.valueOf(tenantId)).list();
+//        String tenantId = request.getHeader("tenantId");
+//        for (BizTechnologicalProcessDetail item : bizTechnologicalProcessDetail) {
+//            item.setTenantId(Long.valueOf(tenantId));
+//        }
+        List<BizTechnologicalProcessDetail> oldList = bizTechnologicalProcessDetailService.query().eq("technological_process_id", bizTechnologicalProcessDetail.get(0).getTechnologicalProcessId()).list();
         boolean batch = saveOrUpdateBatch(bizTechnologicalProcessDetailService, bizTechnologicalProcessDetail, oldList);
         return toAjax(batch);
     }
@@ -96,8 +96,8 @@ public class BizTechnologicalProcessDetailController extends BaseController
     @PostMapping("/singleSave")
     public AjaxResult singleSave(@RequestBody BizTechnologicalProcessDetail bizTechnologicalProcessDetail)
     {
-        String tenantId = request.getHeader("tenantId");
-        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
+//        String tenantId = request.getHeader("tenantId");
+//        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizTechnologicalProcessDetailService.saveOrUpdate(bizTechnologicalProcessDetail));
     }
 
@@ -109,8 +109,8 @@ public class BizTechnologicalProcessDetailController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     {
-        String tenantId = request.getHeader("tenantId");
-        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
+//        String tenantId = request.getHeader("tenantId");
+//        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizTechnologicalProcessDetailService.updateById(bizTechnologicalProcessDetail));
     }
 

src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/domain/BizTechnologicalProcessDetail.java

@@ -91,11 +91,11 @@ public class BizTechnologicalProcessDetail extends BaseEntity {
     @ApiModelProperty(value = "产品描述")
     private String productDescription;
 
-    /**
-     * 图纸
-     */
-    @Excel(name = "图纸")
-    @ApiModelProperty(value = "图纸")
-    private String drawingFile;
+//    /**
+//     * 图纸
+//     */
+//    @Excel(name = "图纸")
+//    @ApiModelProperty(value = "图纸")
+//    private String drawingFile;
 
 }

src/main/resources/mybatis/business/technologicalProcessDetail/BizTechnologicalProcessDetailMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productShaftCategory != null  and productShaftCategory != ''"> AND product_shaft_category = #{productShaftCategory}</if>
             <if test="productShaftCategoryName != null  and productShaftCategoryName != ''"> AND product_shaft_category_name like concat('%', #{productShaftCategoryName}, '%')</if>
             <if test="productDescription != null  and productDescription != ''"> AND product_description = #{productDescription}</if>
-            <if test="drawingFile != null  and drawingFile != ''"> AND drawing_file = #{drawingFile}</if>
+<!--            <if test="drawingFile != null  and drawingFile != ''"> AND drawing_file = #{drawingFile}</if>-->
             <if test="technologicalProcessId != null  and technologicalProcessId != ''"> AND technological_process_id = #{technologicalProcessId}</if>
             <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>