diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java index 166e5426..00baa9c2 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java @@ -524,7 +524,7 @@ public class PoiOutPage { /** * 租赁费用明细 */ - rowNum = createTitleRowStyleCost(sheet, rowNum, "租赁费用明细", titleStyle, listLease.size()); + rowNum = createTitleRowStyleCost(sheet, rowNum, "租赁(超期)费用明细表", titleStyle, listLease.size()); // 填充表头 rowNum = createHeaderRow(sheet, rowNum, listLease, headerStyle); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java index aa07d7e1..d864345f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java @@ -219,7 +219,7 @@ public class ClzSltAgreementInfoController extends BaseController { } } - String fileName = "租赁费用明细表"; + String fileName = "租赁(超期)费用明细表"; String projectName = handleData(projectNames); String unitName = handleData(unitNames); String actualTimeAndName = handleData(actualTimeAndNames); @@ -720,6 +720,7 @@ public class ClzSltAgreementInfoController extends BaseController { maps.put("modelName", bean.getModelName()); maps.put("mtUnitName", bean.getMtUnitName()); maps.put("num", bean.getNum()); + maps.put("buyPrice", bean.getBuyPrice()); maps.put("costs", bean.getCosts()); }else{ maps.put("unitName", bean.getUnitName()); @@ -727,12 +728,12 @@ public class ClzSltAgreementInfoController extends BaseController { maps.put("modelName", bean.getModelName()); maps.put("mtUnitName", bean.getMtUnitName()); maps.put("num", bean.getNum()); + maps.put("buyPrice", bean.getBuyPrice()); maps.put("costs", bean.getCosts()); maps.put("t1", ""); maps.put("t2", ""); maps.put("t3", ""); maps.put("t4", ""); - maps.put("t5", ""); } }else if(type==3){ if(flag==0){ @@ -836,6 +837,7 @@ public class ClzSltAgreementInfoController extends BaseController { list.add("规格型号"); list.add("计量单位"); list.add("丢失数量"); + list.add("原值(元)"); list.add("丢失费用(元)"); }else{ list.add("单位名称"); @@ -843,12 +845,12 @@ public class ClzSltAgreementInfoController extends BaseController { list.add("规格型号"); list.add("计量单位"); list.add("丢失数量"); + list.add("原值(元)"); list.add("丢失费用(元)"); list.add(" "); list.add(" "); list.add(" "); list.add(" "); - list.add(" "); } }else if(type==3){ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java index ed31f170..66c46ac8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java @@ -352,6 +352,18 @@ public class MaterialMachineController extends BaseController { return AjaxResult.success(getDataTable(list)); } + /** + * 后台班组在用库存查询二级页面(不分页) + * @param bean + * @return + */ + @ApiOperation(value = "后台班组在用库存查询二级页面") + @GetMapping("/getTeamNumSecondListNoPage") + public AjaxResult getTeamNumSecondListNoPage(MaterialRetainedEquipmentInfo bean) { + List list = materialMachineService.getTeamNumSecondList(bean); + return AjaxResult.success(getDataTable(list)); + } + /** * 后台班组在用库存查询二级页面 * @param response diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java index c7bb4c55..c65675a9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; @@ -41,8 +42,11 @@ public class MaterialRetainedTeamVo { @Excel(name = "规格型号") private String typeModelName; + @Excel(name = "单位") + private String unitName; + @ApiModelProperty(value = "在用数量") - @Excel(name = "库存") + @Excel(name = "库存",align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal usNum; @ApiModelProperty(value = "关键字") @@ -64,5 +68,4 @@ public class MaterialRetainedTeamVo { @ApiModelProperty(value = "领料ID") private Long leaseId; - private String unitName; } \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index be68502f..e8c772fd 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -1607,6 +1607,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sbd_audit.sg_project_department sp ON sd.company_code = sp.parent_id WHERE sp.`name` IS NOT NULL + and sp.`name` not in ('第一项目管理部(金上)','第十项目管理部(川渝)') AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%') @@ -1626,6 +1627,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bp.imp_unit = #{impUnit} GROUP BY sp.`name` + ORDER BY + -- 先判断是否是数字部门(排在前面) + CASE WHEN SUBSTRING(sp.name,2,1) IN ('一','二','三','四','五','六','七','八','九','十') THEN 0 ELSE 1 END, + -- 数字部门按中文数字排序 + field(SUBSTRING(sp.name,2,1),'一','二','三','四','五','六','七','八','九','十'), + -- 处理十一、十二等 + field(SUBSTRING(sp.name,3,1),'一','二','三','四','五','六','七','八','九','十'), + sp.name