增加导入

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/controller/FailureReasonController.java

@@ -1,17 +1,14 @@
 package cn.com.victorysoft.business.cyyzs.controller;
 
-import cn.com.victorysoft.business.cyyzs.entity.FailureReason;
-import cn.com.victorysoft.business.cyyzs.entity.FailureReasonDetails;
-import cn.com.victorysoft.business.cyyzs.entity.TubularStructure;
-import cn.com.victorysoft.business.cyyzs.entity.TubularStructureHome;
+import cn.com.victorysoft.business.cyyzs.entity.*;
 import cn.com.victorysoft.business.cyyzs.service.FailureReasonService;
+import cn.com.victorysoft.business.sys.entity.ExportResult;
+import cn.com.victorysoft.business.util.ExcelUtils;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -33,11 +30,23 @@ public class FailureReasonController {
         return failureReasonService.selectList(yclx, dwdm, dydm, gylx, type);
     }
 
+    @PostMapping("/export")
+    public ExportResult export(@RequestBody FailureReasonExport param){
+        List<FailureReason> failureReasons = failureReasonService.selectList(param.getYclx(), param.getDwdm(), param.getDydm(), param.getGylx(), param.getType());
+        return ExcelUtils.export(param.getColumnConfig(), failureReasons, param.getFileName());
+    }
+
     @GetMapping("details")
     public PageInfo<FailureReasonDetails> selectDetails(String yclx, String dwdm, String dydm, String jh, String gylx, Integer pageNum, Integer pageSize) {
         return failureReasonService.selectDetails(yclx, dwdm, dydm, jh, gylx, pageNum, pageSize);
     }
 
+    @PostMapping("/details/export")
+    public ExportResult detailsExport(@RequestBody FailureReasonExport param){
+        List<FailureReasonDetails> failureReasonDetails = failureReasonService.selectDetailsAll(param.getYclx(), param.getDwdm(), param.getDydm(), param.getJh(), param.getGylx());
+        return ExcelUtils.export(param.getColumnConfig(), failureReasonDetails, param.getFileName());
+    }
+
     @GetMapping("bar-data")
     public Map<String, Object> getBarData(String yclx, String dwdm, String dydm, String gylx) {
         return failureReasonService.getBarData(yclx, dwdm, dydm, gylx);

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/controller/TubularStructureController.java

@@ -3,15 +3,17 @@ package cn.com.victorysoft.business.cyyzs.controller;
 import cn.com.victorysoft.business.cyyzs.entity.ProductionData;
 import cn.com.victorysoft.business.cyyzs.entity.TubularStructure;
 import cn.com.victorysoft.business.cyyzs.entity.TubularStructureHome;
+import cn.com.victorysoft.business.cyyzs.entity.TubularStructureHomeExport;
+import cn.com.victorysoft.business.cyyzs.param.ProductionExport;
 import cn.com.victorysoft.business.cyyzs.service.TubularStructureService;
+import cn.com.victorysoft.business.sys.entity.ExportResult;
+import cn.com.victorysoft.business.util.ExcelUtils;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -40,9 +42,23 @@ public class TubularStructureController {
         return tubularStructureService.getBarData(yclx, cslb, dwdm, dydm);
     }
 
+    @PostMapping("/export")
+    @ApiOperation("导出管柱结构首页")
+    public ExportResult export(@RequestBody TubularStructureHomeExport param){
+        List<TubularStructureHome> tubularStructureHomes = tubularStructureService.selectList(param.getYclx(), param.getCslb(), param.getDwdm(), param.getDydm());
+        return ExcelUtils.export(param.getColumnConfig(), tubularStructureHomes, param.getFileName());
+    }
+
     @GetMapping("details")
     @ApiOperation("管柱结构")
     public PageInfo<TubularStructure> selectDetails(String yclx, String dwdm, String dydm, String jh, String gylx, String fgq, String cdPsq, String xjf, Integer pageNum, Integer pageSize) {
         return tubularStructureService.selectDetails(yclx, dwdm, dydm, jh, gylx, fgq, cdPsq, xjf, pageNum, pageSize);
     }
+
+    @PostMapping("/details/export")
+    @ApiOperation("导出管柱结构")
+    public ExportResult exportDetails(@RequestBody TubularStructureHomeExport param){
+        List<TubularStructure> tubularStructures = tubularStructureService.selectDetailList(param.getYclx(), param.getDwdm(), param.getDydm(), param.getJh(), param.getGylx(), param.getFgq(), param.getCdPsq(), param.getXjf());
+        return ExcelUtils.export(param.getColumnConfig(), tubularStructures, param.getFileName());
+    }
 }

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/entity/FailureReasonExport.java

@@ -0,0 +1,52 @@
+package cn.com.victorysoft.business.cyyzs.entity;
+
+import lombok.Data;
+import net.sf.json.JSONArray;
+
+/**
+ * @Author TY
+ * @Date: 2023/2/1 14:15
+ */
+@Data
+public class FailureReasonExport {
+
+    /**
+     *
+     */
+    private String yclx;
+
+    /**
+     *
+     */
+    private String dwdm;
+
+    /**
+     *
+     */
+    private String dydm;
+
+    /**
+     *
+     */
+    private String gylx;
+
+    /**
+     *
+     */
+    private String type;
+
+    /**
+     *
+     */
+    private String jh;
+
+    /**
+     *
+     */
+    private JSONArray columnConfig;
+
+    /**
+     *
+     */
+    private String fileName = "导出文件";
+}

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/entity/TubularStructureHomeExport.java

@@ -0,0 +1,75 @@
+package cn.com.victorysoft.business.cyyzs.entity;
+
+import cn.com.victorysoft.business.cyyzs.param.ProductionParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.sf.json.JSONArray;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author TY
+ * @Date: 2023/2/1 10:42
+ */
+@Data
+public class TubularStructureHomeExport {
+
+    /**
+     *
+     */
+    private String fileName = "导出文件";
+
+    /**
+     *
+     */
+    private JSONArray columnConfig;
+
+    /**
+     *
+     */
+    private String yclx;
+
+    /**
+     *
+     */
+    private String cslb;
+
+    /**
+     *
+     */
+    private String dwdm;
+
+    /**
+     *
+     */
+    private String dydm;
+
+    /**
+     *
+     */
+    private String jh;
+
+    /**
+     *
+     */
+    private String gylx;
+
+    /**
+     *
+     */
+    private String fgq;
+
+    /**
+     *
+     */
+    private String cdPsq;
+
+    /**
+     *
+     */
+    private String xjf;
+
+
+
+}

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/service/FailureReasonService.java

@@ -43,6 +43,10 @@ public class FailureReasonService {
         return new PageInfo<>(failureReasonDao.selectDetails(yclx, dwdm, dydm, jh, gylx));
     }
 
+    public List<FailureReasonDetails> selectDetailsAll(String yclx, String dwdm, String dydm, String jh, String gylx) {
+        return failureReasonDao.selectDetails(yclx, dwdm, dydm, jh, gylx);
+    }
+
 
     public Map<String, Object> getBarData(String yclx, String dwdm, String dydm, String gylx) {
         Map<String, Object> map = new HashMap<>();
@@ -78,4 +82,6 @@ public class FailureReasonService {
 
         return list;
     }
+
+
 }

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/service/TubularStructureService.java

@@ -65,4 +65,20 @@ public class TubularStructureService {
 
         return result;
     }
+
+    /**
+     *
+     * @param yclx
+     * @param dwdm
+     * @param dydm
+     * @param jh
+     * @param gylx
+     * @param fgq
+     * @param cdPsq
+     * @param xjf
+     * @return
+     */
+    public List<TubularStructure> selectDetailList(String yclx, String dwdm, String dydm, String jh, String gylx, String fgq, String cdPsq, String xjf) {
+        return tubularStructureDao.selectDetails(yclx, dwdm, dydm, jh, gylx, fgq, cdPsq, xjf);
+    }
 }

vseaf4.4-cyyzs/src/main/resources/mapper/TubularStructureDao.xml

@@ -20,8 +20,8 @@
                 1 = 1
             <if test="yclx != null and yclx != ''"> </if>
             <if test="dydm != null and dydm != ''"> and dydm = #{dydm}</if>
-            <if test="dwdm != null and dwdm != ''"> and dwdm = #{dwdm}</if>
             <if test="cslb != null and cslb != ''"> and cslb = #{cslb}</if>
+            <if test="dwdm != null and dwdm != ''"> and dwdm in (select unitcode from sys_unitinfo start with unitcode = #{dwdm} connect by p_unitcode = prior unitcode) </if>
             group by gylx
         ) a
         left join sys_flag b on a.gylx = b.flag_code
@@ -39,13 +39,13 @@
         where
             1 = 1
         <if test="yclx != null and yclx != ''"> </if>
-        <if test="dwdm != null and dwdm != ''"> and a.dwdm = #{dwdm}</if>
         <if test="dydm != null and dydm != ''"> and a.dydm = #{dydm}</if>
         <if test="jh != null and jh != ''"> and a.jh = #{jh}</if>
         <if test="gylx != null and gylx != ''"> and a.gylx = #{gylx}</if>
         <if test="fgq != null and fgq != ''"> and a.fgq = #{fgq}</if>
         <if test="cdPsq != null and cdPsq != ''"> and a.cd_psq = #{cdPsq}</if>
         <if test="xjf != null and xjf != ''"> and a.xjf = #{xjf}</if>
+        <if test="dwdm != null and dwdm != ''"> and a.dwdm in (select unitcode from sys_unitinfo start with unitcode = #{dwdm} connect by p_unitcode = prior unitcode) </if>
     </select>
 
 

vseaf4.4-sys/src/main/java/cn/com/victorysoft/business/util/ExcelUtils.java

@@ -449,7 +449,7 @@ public class ExcelUtils {
         String dirName = UUID.randomUUID().toString();
         String dirPath = PathUtils.getExportPath() + "/" + dirName;
         File dir = new File(dirPath);
-        boolean mkdir = dir.mkdir();
+        boolean mkdir = dir.mkdirs();
         if (mkdir) {
             FileOutputStream fos;
             try {