bug修复

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WorkSiteDirectManageController.java

@@ -1,14 +1,16 @@
 package com.bonus.material.ma.controller;
 
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
+import com.bonus.common.log.annotation.SysLog;
+import com.bonus.common.log.enums.OperaType;
+import com.bonus.common.security.annotation.RequiresPermissions;
 import com.bonus.common.security.utils.SecurityUtils;
-import com.bonus.material.ma.domain.DirectApplyDetails;
+import com.bonus.material.common.annotation.PreventRepeatSubmit;
-import com.bonus.material.ma.domain.DirectApplyInfo;
+import com.bonus.material.ma.domain.*;
-import com.bonus.material.ma.domain.DirectApplyInfoDetails;
-import com.bonus.material.ma.domain.DirectPassApplyInfoDetails;
 import com.bonus.material.ma.service.WorkSiteDirectManageService;
 import com.bonus.material.settlement.domain.SltAgreementInfo;
 import io.swagger.annotations.Api;
@@ -16,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 
@@ -43,6 +46,20 @@ public class WorkSiteDirectManageController extends BaseController {
         return getDataTable(directApplyInfos);
     }
 
+    /**
+     * 导出机具类型历史库存列表
+     */
+    @ApiOperation(value = "导出工地直转列表")
+    @PreventRepeatSubmit
+    @SysLog(title = "导出工地直转列表", businessType = OperaType.EXPORT, logType = 1,module = "导出工地直转列表")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DirectApplyInfo directApplyInfo)
+    {
+        List<DirectApplyInfo> list = workSiteDirectManageService.getList(directApplyInfo);
+        ExcelUtil<DirectApplyInfo> util = new ExcelUtil<DirectApplyInfo>(DirectApplyInfo.class);
+        util.exportExcel(response, list, "工地直转数据");
+    }
+
     /**
      * 根据协议Id查询在用数据
      */

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java

@@ -1,5 +1,6 @@
 package com.bonus.material.ma.domain;
 
+import com.bonus.common.core.annotation.Excel;
 import com.bonus.common.core.web.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -41,6 +42,7 @@ public class DirectApplyInfo extends BaseEntity {
     /**
      * 退料工程名称
      */
+    @Excel(name = "转让方工程名称", sort = 2)
     private String backProName;
 
     /**
@@ -50,6 +52,7 @@ public class DirectApplyInfo extends BaseEntity {
     /**
      * 退料单位名称
      */
+    @Excel(name = "转让方单位名称", sort = 1)
     private String backUnitName;
 
     /**
@@ -59,6 +62,7 @@ public class DirectApplyInfo extends BaseEntity {
     /**
      * 领料工程名称
      */
+    @Excel(name = "接收方工程名称", sort = 4)
     private String leaseProName;
     /**
      * 领料单位id
@@ -67,6 +71,7 @@ public class DirectApplyInfo extends BaseEntity {
     /**
      * 领料单位名称
      */
+    @Excel(name = "接收方单位名称", sort = 3)
     private String leaseUnitName;
     /**
      * 退料人
@@ -76,6 +81,9 @@ public class DirectApplyInfo extends BaseEntity {
      * 手机号
      */
     private String backPhone;
+
+    @Excel(name = "转让方联系人及电话", sort = 5, width = 30)
+    private String backManAndPhone;
     /**
      * 退料备注
      */
@@ -92,10 +100,21 @@ public class DirectApplyInfo extends BaseEntity {
      * 领料联系电话
      */
     private String leasePhone;
+
+    @Excel(name = "接收方联系人及电话", sort = 6, width = 30)
+    private String leaseManAndPhone;
     /**
      * 领料备注
      */
     private String leaseRemark;
+
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @Excel(
+            name = "办理时间", sort = 7,width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss"
+    )
+    private Date createTimeTwo;
     /**
      * 直转附件
      */
@@ -109,6 +128,7 @@ public class DirectApplyInfo extends BaseEntity {
     /**
      * 0待审批1审批同意2驳回
      */
+    @Excel(name = "状态", sort = 8,readConverterExp = "0=待审批,1=审批同意,2=审批拒绝")
     private String status;
     /**
      * 审核人

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java

@@ -75,7 +75,26 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
 
     @Override
     public List<DirectApplyInfo> getList(DirectApplyInfo directApplyInfo) {
-        return workSiteDirectManageMapper.getList(directApplyInfo);
+        List<DirectApplyInfo> list = workSiteDirectManageMapper.getList(directApplyInfo);
+        list.forEach(item -> {
+            item.setCreateTimeTwo(item.getCreateTime());
+            if(StringUtils.isNotBlank(item.getBackMan()) && StringUtils.isNotBlank(item.getBackPhone())){
+                item.setBackManAndPhone(item.getBackMan() + ":" + item.getBackPhone());
+            }else if(StringUtils.isNotBlank(item.getBackMan()) && !StringUtils.isNotBlank(item.getBackPhone())){
+                item.setBackManAndPhone(item.getBackMan());
+            }else if(!StringUtils.isNotBlank(item.getBackMan()) && StringUtils.isNotBlank(item.getBackPhone())){
+                item.setBackManAndPhone(item.getBackPhone());
+            }
+
+            if(StringUtils.isNotBlank(item.getLeaseMan()) && StringUtils.isNotBlank(item.getLeasePhone())){
+                item.setLeaseManAndPhone(item.getLeaseMan() + ":" + item.getLeasePhone());
+            }else if(StringUtils.isNotBlank(item.getLeaseMan()) && !StringUtils.isNotBlank(item.getLeasePhone())){
+                item.setLeaseManAndPhone(item.getBackMan());
+            }else if(!StringUtils.isNotBlank(item.getLeaseMan()) && StringUtils.isNotBlank(item.getLeasePhone())){
+                item.setLeaseManAndPhone(item.getLeasePhone());
+            }
+        });
+        return list;
     }
 
     @Override

bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java

@@ -5,9 +5,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.biz.domain.lease.LeaseApplyInfo;
 import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
+import com.bonus.material.lease.domain.LeaseApplyDetails;
 import com.bonus.material.scrap.domain.vo.ScrapDetailsListVo;
 import com.bonus.material.scrap.domain.vo.ScrapTaskListVo;
 import com.bonus.material.scrap.domain.vo.ScrapTotalListVo;
@@ -57,6 +59,8 @@ public class ScrapApplyDetailsController extends BaseController {
         return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
+
+
     /**
      * 查询盘点报废任务列表
      * @param scrapApplyDetails
@@ -85,6 +89,19 @@ public class ScrapApplyDetailsController extends BaseController {
         return AjaxResult.success(details);
     }
 
+    @ApiOperation(value = "导出盘点报废任务详情")
+    @PreventRepeatSubmit
+    //@RequiresPermissions("lease:info:export")
+    @SysLog(title = "盘点报废", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出盘点报废任务详情")
+    @PostMapping("/exportDetails")
+    public void exportDetails(HttpServletResponse response, ScrapApplyDetails scrapApplyDetails) {
+        ScrapApplyDetails details = scrapApplyDetailsService.getDetailsList(scrapApplyDetails);
+        List<ScrapApplyDetails> scrapApplyDetailsList = details.getScrapApplyDetailsList();
+        ExcelUtil<ScrapApplyDetails> util = new ExcelUtil<ScrapApplyDetails>(ScrapApplyDetails.class);
+        util.exportExcel(response, scrapApplyDetailsList, "盘点报废任务详情");
+    }
+
+
     /**
      * 新增盘点报废
      * @param scrapApplyDetails

bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java

@@ -48,7 +48,7 @@ public class ScrapApplyDetails extends BaseEntity {
     private List<MaCodeInfo> maCodeList;
 
     /** 任务ID */
-    @Excel(name = "任务ID")
+//    @Excel(name = "任务ID")
     @ApiModelProperty(value = "任务ID")
     private Long taskId;
 
@@ -79,32 +79,35 @@ public class ScrapApplyDetails extends BaseEntity {
     private Byte taskStatus;
 
     /** 上级ID */
-    @Excel(name = "上级ID")
+//    @Excel(name = "上级ID")
     @ApiModelProperty(value = "上级ID")
     private Long parentId;
 
     /** 机具ID */
-    @Excel(name = "机具ID")
+//    @Excel(name = "机具ID")
     @ApiModelProperty(value = "机具ID")
     private Long maId;
 
     @ApiModelProperty(value = "机具ID结果集")
     private String maIds;
 
+    @Excel(name = "设备编码",sort=6)
     @ApiModelProperty(value = "设备编码")
     private String maCode;
 
     /** 规格ID */
-    @Excel(name = "规格ID")
+//    @Excel(name = "规格ID")
     @ApiModelProperty(value = "规格ID")
     private Long typeId;
 
+    @Excel(name = "规格型号",sort=2)
     @ApiModelProperty(value = "规格型号名称")
     private String typeName;
 
     @ApiModelProperty(value = "物资类型ID")
     private Long typeNameId;
 
+    @Excel(name = "物资类型",sort=1)
     @ApiModelProperty(value = "物资类型名称")
     private String maTypeName;
 
@@ -113,6 +116,7 @@ public class ScrapApplyDetails extends BaseEntity {
     @ApiModelProperty(value = "管理方式")
     private String manageType;
 
+    @Excel(name = "计量单位",sort=3)
     @ApiModelProperty(value = "单位")
     private String unitName;
 
@@ -136,24 +140,25 @@ public class ScrapApplyDetails extends BaseEntity {
     @ApiModelProperty(value = "购置价")
     private BigDecimal buyPrice;
 
-    @Excel(name = "库存数量")
+    @Excel(name = "当前库存",sort=4)
     @ApiModelProperty(value = "库存数量")
     private BigDecimal storageNum;
 
     /** 报废数量 */
-    @Excel(name = "报废数量")
+    @Excel(name = "报废数量",sort=5)
     @ApiModelProperty(value = "报废数量")
     private BigDecimal scrapNum;
 
     /** (1退料2,维修审核，3盘点) */
-    @Excel(name = "(1退料2,维修审核，3盘点)")
+//    @Excel(name = "(1退料2,维修审核，3盘点)")
     @ApiModelProperty(value = "(1退料2,维修审核，3盘点)")
     private String scrapSource;
 
     /** （0自然，1人为） */
-    @Excel(name = "报废类型", readConverterExp = "0=自然，1人为")
+//    @Excel(name = "报废类型", readConverterExp = "0=自然，1人为")
     private String scrapType;
 
+    @Excel(name = "报废原因",sort=7)
     @ApiModelProperty(value = "报废原因")
     private String scrapReason;
 
@@ -171,32 +176,32 @@ public class ScrapApplyDetails extends BaseEntity {
     /** 审核时间 */
     @ApiModelProperty(value = "审核时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date auditTime;
 
     /** 报废台账审核时间 */
     @ApiModelProperty(value = "报废台账审核时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报废台账审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "报废台账审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date ledgerTime;
 
     /** 审核备注 */
-    @Excel(name = "审核备注")
+//    @Excel(name = "审核备注")
     @ApiModelProperty(value = "审核备注")
     private String auditRemark;
 
     /** 数据所属组织 */
-    @Excel(name = "数据所属组织")
+//    @Excel(name = "数据所属组织")
     @ApiModelProperty(value = "数据所属组织")
     private Long companyId;
 
     /** 文件名 */
-    @Excel(name = "文件名")
+//    @Excel(name = "文件名")
     @ApiModelProperty(value = "文件名")
     private String fileName;
 
     /** 文件url */
-    @Excel(name = "文件url")
+//    @Excel(name = "文件url")
     @ApiModelProperty(value = "文件url")
     private String fileUrl;