工艺导出

src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsTechnologicalProcessController.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.fbsInventory.entity.FbsInventory;
+import org.jeecg.modules.fbsInventory.service.IFbsInventoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,7 +51,9 @@ import com.alibaba.fastjson.JSON;
 public class FbsTechnologicalProcessController {
 	@Autowired
 	private IFbsTechnologicalProcessService fbsTechnologicalProcessService;
-	
+	@Autowired
+	private IFbsInventoryService iFbsInventoryService;
+
 	/**
 	  * 分页列表查询
 	 * @param fbsTechnologicalProcess
@@ -70,6 +74,7 @@ public class FbsTechnologicalProcessController {
 		}
 		QueryWrapper<FbsTechnologicalProcess> queryWrapper = QueryGenerator.initQueryWrapper(fbsTechnologicalProcess, req.getParameterMap());
 		queryWrapper.lambda().eq(FbsTechnologicalProcess::getDelFlag,"0");
+		queryWrapper.lambda().orderByDesc(FbsTechnologicalProcess::getCreateTime);
 		if(StringUtils.isNotBlank(cInvCName)){
 			queryWrapper.like("i.cInvCName",cInvCName);
 		}
@@ -80,6 +85,26 @@ public class FbsTechnologicalProcessController {
 		result.setResult(pageList);
 		return result;
 	}
+
+
+	 /**
+	  * 列表导出主子数据
+	  * @param fbsTechnologicalProcess
+	  * @return
+	  */
+	 @GetMapping(value = "/getExport")
+	public Result<List<FbsTechnologicalProcess>> getExport(FbsTechnologicalProcess fbsTechnologicalProcess){
+		Result<List<FbsTechnologicalProcess>> result=new Result<>();
+		try {
+			List<FbsTechnologicalProcess> list=fbsTechnologicalProcessService.getExport(fbsTechnologicalProcess);
+			result.setResult(list);
+			result.success("操作成功");
+		} catch (Exception e) {
+			result.error500("操作失败："+e.getMessage());
+			throw new RuntimeException(e);
+		}
+		return result;
+	}
 	
 	/**
 	  *   添加
@@ -172,6 +197,10 @@ public class FbsTechnologicalProcessController {
 		if(fbsTechnologicalProcess==null) {
 			result.error500("未找到对应实体");
 		}else {
+			FbsInventory fbsInventory=iFbsInventoryService.getInventory(fbsTechnologicalProcess.getName());
+			if(fbsInventory!=null){
+				fbsTechnologicalProcess.setCinvCName(fbsInventory.getCinvname());
+			}
 			result.setResult(fbsTechnologicalProcess);
 			result.setSuccess(true);
 		}

src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsTechnologicalProcess.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsBasedate.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -78,6 +79,14 @@ public class FbsTechnologicalProcess implements Serializable {
 	@TableField(exist = false)
 	private String cinvCName;
 
+	//子表工艺名称
+	@TableField(exist = false)
+	private String itemName;
+
+	//标准工时
+	@TableField(exist = false)
+	private BigDecimal standardWorkingHours;
+
 	//明细
 	@TableField(exist = false)
 	private List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemList;

src/main/java/org/jeecg/modules/fbsBasedate/mapper/FbsTechnologicalProcessMapper.java

@@ -17,4 +17,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface FbsTechnologicalProcessMapper extends BaseMapper<FbsTechnologicalProcess> {
 
     IPage<FbsTechnologicalProcess> findByPage(IPage<FbsTechnologicalProcess> page, @Param("ew") QueryWrapper<FbsTechnologicalProcess> queryWrapper);
+
+    /**
+     * 列表导出主子表数据
+     * @param fbsTechnologicalProcess
+     * @return
+     */
+    List<FbsTechnologicalProcess> getExport( @Param("fbsTechnologicalProcess")FbsTechnologicalProcess fbsTechnologicalProcess);
 }

src/main/java/org/jeecg/modules/fbsBasedate/mapper/xml/FbsTechnologicalProcessMapper.xml

@@ -10,4 +10,24 @@
             LEFT JOIN inventory i ON ftp.NAME = i.cInvCode
             ${ew.customSqlSegment}
     </select>
+
+    <select id="getExport" resultType="org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess">
+        SELECT
+        ftp.*,
+        i.cInvCName as cinvCName,
+        ftpi.name as itemName,
+        ftpi.standard_working_hours
+        FROM fbs_technological_process ftp
+        LEFT JOIN inventory i ON ftp.NAME = i.cInvCode
+        LEFT JOIN fbs_technological_process_item ftpi ON ftp.id=ftpi.fbs_technological_process_id
+        where
+        ftp.del_flag='0' AND ftpi.del_flag='0'
+        <if test="fbsTechnologicalProcess.name!=null and fbsTechnologicalProcess.name!=''">
+            AND ftp.name =#{fbsTechnologicalProcess.name}
+        </if>
+        <if test="fbsTechnologicalProcess.cinvCName!=null and fbsTechnologicalProcess.cinvCName!=''">
+            AND i.cInvCName LIKE "%" #{fbsTechnologicalProcess.cinvCName} "%"
+        </if>
+        order by ftp.create_time desc,ftpi.sort asc
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsBasedate/service/IFbsTechnologicalProcessService.java

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 工艺流程档案
  * @author： jeecg-boot
@@ -19,4 +21,5 @@ public interface IFbsTechnologicalProcessService extends IService<FbsTechnologic
 
     IPage<FbsTechnologicalProcess> findByPage(IPage<FbsTechnologicalProcess> page, QueryWrapper<FbsTechnologicalProcess> queryWrapper);
 
+    List<FbsTechnologicalProcess> getExport(FbsTechnologicalProcess fbsTechnologicalProcess);
 }

src/main/java/org/jeecg/modules/fbsBasedate/service/impl/FbsTechnologicalProcessServiceImpl.java

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 工艺流程档案
  * @author： jeecg-boot
@@ -69,4 +71,9 @@ public class FbsTechnologicalProcessServiceImpl extends ServiceImpl<FbsTechnolog
     public IPage<FbsTechnologicalProcess> findByPage(IPage<FbsTechnologicalProcess> page, QueryWrapper<FbsTechnologicalProcess> queryWrapper) {
         return this.baseMapper.findByPage(page,queryWrapper);
     }
+
+    @Override
+    public List<FbsTechnologicalProcess> getExport(FbsTechnologicalProcess fbsTechnologicalProcess) {
+        return this.baseMapper.getExport(fbsTechnologicalProcess);
+    }
 }