禅道bug修复
This commit is contained in:
parent
c3b5949935
commit
26df45d72a
|
|
@ -62,6 +62,19 @@ public class TypeController extends BaseController {
|
|||
return getDataTable(maTypeHistories);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出功物资历史价格列表
|
||||
*/
|
||||
@ApiOperation(value = "导出物资历史价格列表")
|
||||
@SysLog(title = "物资历史价格列表", businessType = OperaType.EXPORT, logType = 1,module = "w物资管理->租赁价格历史")
|
||||
@PostMapping("/exportHistory")
|
||||
public void export(HttpServletResponse response, MaTypeHistory maTypeHistory)
|
||||
{
|
||||
List<MaTypeHistory> list = typeService.getMaTypeHistoryListBy(maTypeHistory);
|
||||
ExcelUtil<MaTypeHistory> util = new ExcelUtil<MaTypeHistory>(MaTypeHistory.class);
|
||||
util.exportExcel(response, list, "物资历史价格列表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出物资类型管理列表
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.bonus.material.ma.domain;
|
||||
|
||||
import com.bonus.common.core.annotation.Excel;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
|
@ -24,20 +25,21 @@ public class MaTypeHistory {
|
|||
|
||||
private String typeName;
|
||||
|
||||
@Excel(name = "物资类型")
|
||||
private String maType;
|
||||
|
||||
@Excel(name = "物资名称")
|
||||
private String maName;
|
||||
|
||||
@Excel(name = "规格型号")
|
||||
private String maModel;
|
||||
|
||||
@Excel(name = "修改前租赁价格(元)")
|
||||
private BigDecimal beforePrice;
|
||||
|
||||
@Excel(name = "修改后租赁价格(元)")
|
||||
private BigDecimal afterPrice;
|
||||
|
||||
@Excel(name = "修改人")
|
||||
private String createBy;
|
||||
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
private String createBy;
|
||||
|
||||
private String keyword;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,9 +26,18 @@ public class PartType extends BaseEntity
|
|||
|
||||
/** 类型ID */
|
||||
private Long id;
|
||||
@Excel(name = "配件类型",sort=1)
|
||||
@ApiModelProperty(value = "配件类型")
|
||||
private String partType;
|
||||
|
||||
@Excel(name = "配件名称",sort=2)
|
||||
@ApiModelProperty(value = "配件名称")
|
||||
private String partName;
|
||||
|
||||
|
||||
|
||||
/** 规格型号 */
|
||||
@Excel(name = "规格型号")
|
||||
@Excel(name = "规格型号",sort=3)
|
||||
@ApiModelProperty(value = "规格型号")
|
||||
@NotBlank(message = "名称不能为空")
|
||||
@Size(max=30, message = "名称长度不能超过30")
|
||||
|
|
@ -39,7 +48,7 @@ public class PartType extends BaseEntity
|
|||
private Long parentId;
|
||||
|
||||
/** 帐号状态（0正常 1停用） */
|
||||
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
|
||||
// @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
|
||||
private String status;
|
||||
|
||||
/** 计量单位ID */
|
||||
|
|
@ -47,19 +56,19 @@ public class PartType extends BaseEntity
|
|||
private String unitId;
|
||||
|
||||
/** 计量单位名称 */
|
||||
@Excel(name = "计量单位")
|
||||
@Excel(name = "计量单位",sort=4)
|
||||
@ApiModelProperty(value = "计量单位名称")
|
||||
@Size(max=64, message = "计量单位长度不能超过64")
|
||||
private String unitName;
|
||||
|
||||
/** 原值 */
|
||||
@Excel(name = "购置价格（元）")
|
||||
@Excel(name = "购置价格（元）",sort=5)
|
||||
@ApiModelProperty(value = "原值")
|
||||
@Size(max=10, message = "购置价格长度不能超过10")
|
||||
private BigDecimal buyPrice;
|
||||
|
||||
/** 实时库存 */
|
||||
@Excel(name = "数量")
|
||||
@Excel(name = "数量",sort=6)
|
||||
@ApiModelProperty(value = "实时库存")
|
||||
private Long storageNum;
|
||||
|
||||
|
|
@ -82,7 +91,7 @@ public class PartType extends BaseEntity
|
|||
@ApiModelProperty(value = "框架年份")
|
||||
private String year;
|
||||
|
||||
@Excel(name = "备注")
|
||||
@Excel(name = "备注信息",sort=7)
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty(value = "关键字")
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
//@RequiresPermissions("purchase:info:add")
|
||||
@SysLog(title = "新购验收任务", businessType = OperaType.INSERT, module = "物资新购->新增新购验收任务")
|
||||
@PostMapping
|
||||
public AjaxResult add(@Valid @NotNull @RequestBody PurchaseCheckDto purchaseCheckDto) {
|
||||
public AjaxResult purchase_check_infoadd(@Valid @NotNull @RequestBody PurchaseCheckDto purchaseCheckDto) {
|
||||
try {
|
||||
return purchaseCheckInfoService.insertPurchaseCheckInfo(purchaseCheckDto);
|
||||
} catch (final Exception e) {
|
||||
|
|
@ -182,8 +182,9 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
//@RequiresPermissions("purchase:info:export")
|
||||
@SysLog(title = "新购验收任务详细", businessType = OperaType.EXPORT, logType = 1,module = "物资新购->导出新购验收任务详细")
|
||||
@PostMapping("/exportDetails")
|
||||
public void exportDetails(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) {
|
||||
List<PurchaseCheckDetails> list = purchaseCheckInfoService.selectPurchaseCheckDetailsList(purchaseCheckInfo);
|
||||
public void exportDetails(HttpServletResponse response, PurchaseQueryDto purchaseQueryDto) {
|
||||
PurchaseCheckDto dto = purchaseCheckInfoService.selectPurchaseCheckInfoById(purchaseQueryDto);
|
||||
List<PurchaseCheckDetails> list = dto.getPurchaseCheckDetailsList();
|
||||
ExcelUtil<PurchaseCheckDetails> util = new ExcelUtil<>(PurchaseCheckDetails.class);
|
||||
util.exportExcel(response, list, "新购验收任务详细数据");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,89 +21,89 @@ public class ScrapApplyDetailsVO {
|
|||
/**
|
||||
* 报废审核单号
|
||||
*/
|
||||
@Excel(name = "报废审核单号",sort = 1)
|
||||
@Excel(name = "任务单号",sort = 4)
|
||||
private String scrapNum;
|
||||
|
||||
@ApiModelProperty(value = "维修任务单号")
|
||||
private String repairTaskCode;
|
||||
|
||||
/**
|
||||
* 单位名称
|
||||
*/
|
||||
@Excel(name = "单位名称",sort = 2)
|
||||
@Excel(name = "退料单位",sort = 1)
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 工程名称
|
||||
*/
|
||||
@Excel(name = "工程名称",sort = 3)
|
||||
@Excel(name = "工程名称",sort = 2)
|
||||
private String projectName;
|
||||
|
||||
/**
|
||||
* 维修班组名称
|
||||
*/
|
||||
@ApiModelProperty(value = "维修班组名称")
|
||||
@Excel(name = "维修班组",sort = 6)
|
||||
@ApiModelProperty(value = "维修班组")
|
||||
private String teamName;
|
||||
|
||||
/**
|
||||
* 任务创建人
|
||||
*/
|
||||
@Excel(name = "任务创建人",sort = 4)
|
||||
@Excel(name = "提交人",sort = 7)
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 机具类型
|
||||
*/
|
||||
@Excel(name = "物资类型",sort = 5)
|
||||
private String itemType;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Excel(name = "任务创建时间",sort = 5)
|
||||
@Excel(name = "提交时间",sort = 8)
|
||||
private String createTime;
|
||||
|
||||
/**
|
||||
* 维修单号
|
||||
*/
|
||||
@Excel(name = "维修单号",sort = 6)
|
||||
@Excel(name = "维修审核单号",sort = 3)
|
||||
private String repairNum;
|
||||
|
||||
/**
|
||||
* 审核状态
|
||||
*/
|
||||
@Excel(name = "状态",sort = 9,readConverterExp = "10=维修审核进行中,11=维修审核完成,12=维修审核被驳回")
|
||||
private Integer taskStatus;
|
||||
|
||||
/**
|
||||
* 审核状态
|
||||
*/
|
||||
@Excel(name = "审核状态",sort = 7)
|
||||
private String taskStatusName;
|
||||
|
||||
/**
|
||||
* 不通过原因
|
||||
*/
|
||||
@Excel(name = "不通过原因",sort = 8)
|
||||
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 机具类型
|
||||
*/
|
||||
@Excel(name = "机具类型",sort = 9)
|
||||
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
@Excel(name = "规格型号",sort = 10)
|
||||
|
||||
private String typeName;
|
||||
|
||||
@ApiModelProperty(value = "机具编号")
|
||||
@Excel(name = "机具编号",sort = 11)
|
||||
|
||||
private String maCode;
|
||||
|
||||
|
||||
/** 报废数量 */
|
||||
@Excel(name = "报废数量")
|
||||
private Integer scrapNum2;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</where>
|
||||
</select>
|
||||
|
||||
<select id="getListByTypeName" resultType="com.bonus.material.ma.domain.vo.PartTypeVo">
|
||||
<select id="getListByTypeName" resultType="com.bonus.material.ma.domain.PartType">
|
||||
SELECT DISTINCT
|
||||
m.pa_id AS id,
|
||||
m.pa_name AS paName,
|
||||
|
|
|
|||
Loading…
Reference in New Issue