Skip to content

T
tianjin-cement
Commit 914542a3 authored by shulidong's avatar shulidong
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 68db5068 6c990697
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1295 additions and 472 deletions
cement-business/pom.xml
View file @ 914542a3
......@@ -146,6 +146,23 @@
<scope>system</scope> <!--system，类似provided，需要显式提供依赖的jar以后，Maven就不会在Repository中查找它-->
<systemPath>${basedir}/lib/aspose-cells-8.5.2.jar</systemPath> <!--项目根目录下的lib文件夹下-->
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jcommon</artifactId>
<version>1.0.24</version>
</dependency>
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.5.0</version>
</dependency>
</dependencies>
<build>
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/CabinetController.java
View file @ 914542a3
......@@ -42,7 +42,6 @@ public class CabinetController {
@PostMapping("/new")
@ApiOperation("新增柜子")
public BaseResponse<Boolean> newCabinet(@RequestBody Cabinet cabinet) {
boolean save = iCabinetService.save(cabinet);
if (save) {
return BaseResponse.okData(true);
......@@ -79,6 +78,5 @@ public class CabinetController {
return BaseResponse.errorMsg("删除失败!");
}
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EquipmentController.java
View file @ 914542a3
......@@ -302,12 +302,13 @@ public class EquipmentController {
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "brand", value = "设备品牌", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "supplierId", value = "供应商表id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "name", value = "设备名称", paramType = "query", dataType = "String")
@ApiImplicitParam(name = "name", value = "设备名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "code", value = "设备编号", paramType = "query", dataType = "String")
})
@GetMapping("/getUsePage")
public BaseResponse getUsePage(PageQuery pageQuery, String brand, Integer supplierId, String name) {
public BaseResponse getUsePage(PageQuery pageQuery, String brand, Integer supplierId, String name, String code) {
try {
return equipmentService.getUsePage(pageQuery, brand, supplierId, name);
return equipmentService.getUsePage(pageQuery, brand, supplierId, name, code);
} catch (Exception e) {
log.debug("设备使用记录分页列表{}", e);
}
......@@ -316,9 +317,9 @@ public class EquipmentController {
@ApiOperation("设备使用记录导出")
@PostMapping("/exportUse")
public void exportUse(String brand, Integer supplierId, String name, String fileName, HttpServletResponse response) {
public void exportUse(String brand, Integer supplierId, String name, String code, String fileName, HttpServletResponse response) {
try {
equipmentService.exportUse(brand, supplierId, name, fileName, response);
equipmentService.exportUse(brand, supplierId, name, code, fileName, response);
} catch (Exception e) {
log.debug("设备使用记录导出{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java
View file @ 914542a3
......@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.NormProduction;
......@@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Date;
......@@ -118,7 +120,7 @@ public class NormProductionController {
Long endTime = null;
if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
startTime = DateUtil.parseDate(start).getTime();
endTime = DateUtil.parseDate(end).getTime();
endTime = DateUtil.parseDate(end).offsetNew(DateField.DAY_OF_MONTH, 1).getTime();
}
//将list拆分成分页
......@@ -140,14 +142,15 @@ public class NormProductionController {
public BaseResponse<Page<NormProduction.NormProductionDetail>> normProductionDetails(Integer userId, String start,
String end, PageQuery pageQuery) {
Assert.notNull(userId,"用户id是必填的!");
Assert.notNull(userId, "用户id是必填的!");
Long startTime = null;
Long endTime = null;
if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
startTime = DateUtil.parseDate(start).getTime();
endTime = DateUtil.parseDate(end).getTime();
endTime = DateUtil.parseDate(end).offsetNew(DateField.DAY_OF_MONTH, 1).getTime();
}
List<NormProduction.NormProductionDetail> data = iPrecipriceService.normProductionDetails(userId, startTime, endTime);
List<NormProduction.NormProductionDetail> collect = data
.stream()
.filter(arg -> arg.getUserId().intValue() == userId)
......@@ -167,7 +170,7 @@ public class NormProductionController {
Long endTime = null;
if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
startTime = DateUtil.parseDate(start).getTime();
endTime = DateUtil.parseDate(end).getTime();
endTime = DateUtil.parseDate(end).offsetNew(DateField.DAY_OF_MONTH, 1).getTime();
}
List<ProductionVo> rts = iPrecipriceService.production(name, startTime, endTime, groupId);
......@@ -216,7 +219,7 @@ public class NormProductionController {
Long endTime = null;
if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
startTime = DateUtil.parseDate(start).getTime();
endTime = DateUtil.parseDate(end).getTime();
endTime = DateUtil.parseDate(end).offsetNew(DateField.DAY_OF_MONTH, 1).getTime();
}
iNormProductionService.exportNormProductionStatistics(startTime, endTime, name, groupId, response);
}
......@@ -229,7 +232,7 @@ public class NormProductionController {
Long endTime = null;
if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
startTime = DateUtil.parseDate(start).getTime();
endTime = DateUtil.parseDate(end).getTime();
endTime = DateUtil.parseDate(end).offsetNew(DateField.DAY_OF_MONTH, 1).getTime();
}
iPrecipriceService.exportNormProductionDetail(userId, startTime, endTime, response);
}
......@@ -241,7 +244,7 @@ public class NormProductionController {
Long endTime = null;
if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
startTime = DateUtil.parseDate(start).getTime();
endTime = DateUtil.parseDate(end).getTime();
endTime = DateUtil.parseDate(end).offsetNew(DateField.DAY_OF_MONTH, 1).getTime();
}
iNormProductionService.exportProduction(name, startTime, endTime, groupId, response);
......@@ -253,7 +256,7 @@ public class NormProductionController {
public BaseResponse<List<WorkloadStatisticsVo>> workloadStatistics(String start, String end, Integer userId) {
LoginUser loginUser = iSysUserService.getLoginUser();
if (BeanUtil.isEmpty(loginUser)){
if (BeanUtil.isEmpty(loginUser)) {
return BaseResponse.errorMsg("请登录!");
}
......@@ -265,11 +268,10 @@ public class NormProductionController {
Date endTime = DateUtil.date();
if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
startTime = DateUtil.parseDate(start);
endTime = DateUtil.parseDate(end);
endTime = DateUtil.parseDate(end).offsetNew(DateField.DAY_OF_MONTH, 1);
}
return BaseResponse.okData(iPrecipriceService.workloadStatistics(startTime, endTime, userId));
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanConsumablesPurchaseController.java
View file @ 914542a3
......@@ -3,8 +3,11 @@ package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
import cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo;
import cn.wise.sc.cement.business.service.IPlanConsumablesPurchaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
......@@ -58,6 +61,12 @@ public class PlanConsumablesPurchaseController {
}
}
@PostMapping("/export/word")
@ApiOperation("消耗品采购计划列表导出(word)")
public void exportWord(HttpServletResponse response){
consumablesPurchaseService.exportWord(response);
}
@ApiOperation(value = "新增消耗品采购计划")
@PostMapping("/create")
public BaseResponse create(@RequestBody PlanConsumablesPurchaseQuery query) {
......@@ -93,9 +102,9 @@ public class PlanConsumablesPurchaseController {
@ApiOperation(value = "采购完成")
@PostMapping("/finish")
public BaseResponse finish(Integer id) {
public BaseResponse finish(PlanFinishQuery query) {
try {
return consumablesPurchaseService.finish(id);
return consumablesPurchaseService.finish(query);
} catch (Exception e) {
log.debug("采购完成{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanEquipmentMaintainController.java
View file @ 914542a3
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentMaintainQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.service.IPlanEquipmentMaintainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -93,9 +94,9 @@ public class PlanEquipmentMaintainController {
@ApiOperation(value = "维护完成")
@PostMapping("/finish")
public BaseResponse finish(Integer id) {
public BaseResponse finish(PlanFinishQuery query) {
try {
return equipmentMaintainService.finish(id);
return equipmentMaintainService.finish(query);
} catch (Exception e) {
log.debug("维护完成{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanEquipmentPurchaseController.java
View file @ 914542a3
......@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.query.TeamQuery;
import cn.wise.sc.cement.business.service.IPlanEquipmentPurchaseService;
import io.swagger.annotations.Api;
......@@ -36,12 +37,13 @@ public class PlanEquipmentPurchaseController {
@ApiOperation(value = "设备采购计划分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String")
@ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "状态：0待采购，1已完成", paramType = "query", dataType = "Integer")
})
@GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery, String name) {
public BaseResponse getPage(PageQuery pageQuery, String name, Integer status) {
try {
return equipmentPurchaseService.getPage(pageQuery, name);
return equipmentPurchaseService.getPage(pageQuery, name, status);
} catch (Exception e) {
log.debug("设备采购计划分页列表{}", e);
}
......@@ -50,14 +52,22 @@ public class PlanEquipmentPurchaseController {
@ApiOperation("设备采购计划列表导出")
@PostMapping("/export")
public void export(String name, String fileName, HttpServletResponse response) {
public void export(String name, String fileName, Integer status, HttpServletResponse response) {
try {
equipmentPurchaseService.export(name, fileName, response);
equipmentPurchaseService.export(name, fileName, status, response);
} catch (Exception e) {
log.debug("设备采购计划列表导出{}", e);
}
}
@ApiOperation("设备采购计划列表导出(word)")
@PostMapping("/export/word")
public void exportWord(HttpServletResponse response){
equipmentPurchaseService.exportWord(response);
}
@ApiOperation(value = "新增设备采购计划")
@PostMapping("/create")
public BaseResponse create(@RequestBody PlanEquipmentPurchaseQuery query) {
......@@ -93,9 +103,9 @@ public class PlanEquipmentPurchaseController {
@ApiOperation(value = "采购完成")
@PostMapping("/finish")
public BaseResponse finish(Integer id) {
public BaseResponse finish(PlanFinishQuery query) {
try {
return equipmentPurchaseService.finish(id);
return equipmentPurchaseService.finish(query);
} catch (Exception e) {
log.debug("采购完成{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanEquipmentRepairController.java
View file @ 914542a3
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentRepairQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.service.IPlanEquipmentRepairService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -93,9 +94,9 @@ public class PlanEquipmentRepairController {
@ApiOperation(value = "维修完成")
@PostMapping("/finish")
public BaseResponse finish(Integer id) {
public BaseResponse finish(PlanFinishQuery query) {
try {
return equipmentRepairService.finish(id);
return equipmentRepairService.finish(query);
} catch (Exception e) {
log.debug("维修完成{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanStandardPurchaseController.java
View file @ 914542a3
......@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
import cn.wise.sc.cement.business.service.IPlanStandardPurchaseService;
import io.swagger.annotations.Api;
......@@ -59,6 +60,14 @@ public class PlanStandardPurchaseController {
}
}
@ApiOperation("标样采购计划列表导出(word)")
@PostMapping("/export/word")
public void exportWord(HttpServletResponse response) {
standardPurchaseService.exportWord(response);
}
@ApiOperation(value = "新增标样采购计划")
@PostMapping("/create")
public BaseResponse create(@RequestBody PlanStandardPurchaseQuery query) {
......@@ -94,9 +103,9 @@ public class PlanStandardPurchaseController {
@ApiOperation(value = "采购完成")
@PostMapping("/finish")
public BaseResponse finish(Integer id) {
public BaseResponse finish(PlanFinishQuery query) {
try {
return standardPurchaseService.finish(id);
return standardPurchaseService.finish(query);
} catch (Exception e) {
log.debug("采购完成{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SampleController.java
View file @ 914542a3
......@@ -81,6 +81,12 @@ public class SampleController {
}
}
@ApiOperation("样品列表导出(word)")
@PostMapping("/export/word")
public void exportWord(HttpServletResponse response){
sampleService.exportWord(response);
}
@ApiOperation(value = "样品详情")
@GetMapping("/{id}")
public BaseResponse getById(@PathVariable Integer id) {
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SupplierController.java
View file @ 914542a3
......@@ -5,7 +5,9 @@ import cn.wise.sc.cement.business.entity.SysPost;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PostQuery;
import cn.wise.sc.cement.business.model.query.SupplierEnclosureQuery;
import cn.wise.sc.cement.business.model.query.SupplierQuery;
import cn.wise.sc.cement.business.model.query.SysUserEnclosureQuery;
import cn.wise.sc.cement.business.service.ISupplierService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -111,5 +113,38 @@ public class SupplierController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "上传附件")
@PostMapping("/upload")
public BaseResponse uploadPeoplePF(@RequestBody SupplierEnclosureQuery query){
try {
return supplierService.upload(query);
}catch (Exception e){
log.debug("上传附件{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "附件分页列表")
@GetMapping("/getEnclosurePage")
public BaseResponse getEnclosurePage(PageQuery pageQuery, Integer userId) {
try {
return supplierService.getEnclosurePage(pageQuery, userId);
} catch (Exception e) {
log.debug("附件分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "删除附件")
@PostMapping("/deleteEnclosure")
public BaseResponse deleteEnclosure(Integer id) {
try {
return supplierService.deleteEnclosure(id);
} catch (Exception e) {
log.debug("删除附件{}", e);
}
return BaseResponse.errorMsg("失败!");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SupplierEnclosureController.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2020-11-21
*/
@RestController
@RequestMapping("/business/supplier-enclosure")
public class SupplierEnclosureController {
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Consumables.java
View file @ 914542a3
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
......@@ -55,10 +56,17 @@ public class Consumables implements Serializable {
@ApiModelProperty("采购日期（购买日期）")
private LocalDate purchaseDate;
@ApiModelProperty("库存数量")
@ApiModelProperty("库存数量 单位：g")
private BigDecimal stockNum;
@ApiModelProperty("库存提醒数量（少于多少进行提醒）")
@ApiModelProperty("入库数量 （单位：瓶）")
@TableField(exist = false)
private Integer enterNum;
@ApiModelProperty("多少g/瓶")
private BigDecimal unitStock;
@ApiModelProperty("库存提醒数量（少于多少g进行提醒）")
private BigDecimal leastNum;
@ApiModelProperty("有效日期")
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/ConsumablesEnter.java
View file @ 914542a3
......@@ -40,8 +40,8 @@ public class ConsumablesEnter implements Serializable {
@ApiModelProperty("操作人id")
private Integer userId;
@ApiModelProperty("新增数量")
private BigDecimal enterNum;
@ApiModelProperty("新增数量 瓶")
private Integer enterNum;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanConsumablesPurchase.java
View file @ 914542a3
......@@ -67,6 +67,9 @@ public class PlanConsumablesPurchase implements Serializable {
@ApiModelProperty("状态（0禁用，1已启用）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentMaintain.java
View file @ 914542a3
......@@ -71,6 +71,9 @@ public class PlanEquipmentMaintain implements Serializable {
@ApiModelProperty("状态（0待完成，1已完成）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentPurchase.java
View file @ 914542a3
......@@ -67,6 +67,9 @@ public class PlanEquipmentPurchase implements Serializable {
@ApiModelProperty("状态（0待采购，1已完成）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentRepair.java
View file @ 914542a3
......@@ -64,6 +64,9 @@ public class PlanEquipmentRepair implements Serializable {
@ApiModelProperty("状态（0待完成，1已完成）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanStandardPurchase.java
View file @ 914542a3
......@@ -62,6 +62,9 @@ public class PlanStandardPurchase implements Serializable {
@ApiModelProperty("状态（0禁用，1已启用）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Standard.java
View file @ 914542a3
......@@ -49,6 +49,9 @@ public class Standard implements Serializable {
@ApiModelProperty("购买厂商（经销单位）")
private String supplierName;
@ApiModelProperty("生产日期")
private LocalDate productionDate;
@ApiModelProperty("进样日期")
private LocalDate purchaseDate;
......@@ -58,13 +61,16 @@ public class Standard implements Serializable {
@ApiModelProperty("存储位置")
private String position;
@ApiModelProperty("库存数量")
@ApiModelProperty("库存数量 （单位：g）")
private BigDecimal stockNum;
@ApiModelProperty("多少g/瓶")
private BigDecimal unitStock;
@ApiModelProperty("库存提醒数量（少于多少进行提醒）")
private BigDecimal leastNum;
@ApiModelProperty("状态（0已作废，1启用中）")
@ApiModelProperty("状态（0已作废，1有效）")
private Integer status;
@ApiModelProperty("创建时间")
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/StandardEnter.java
View file @ 914542a3
......@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -40,8 +41,8 @@ public class StandardEnter implements Serializable {
@ApiModelProperty("操作人id")
private Integer userId;
@ApiModelProperty("新增数量")
private BigDecimal enterNum;
@ApiModelProperty("新增数量(单位： 瓶)")
private Integer enterNum;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SupplierEnclosure.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-11-21
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SupplierEnclosure implements Serializable {
private static final long serialVersionUID=1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 用户id
*/
private Integer supplierId;
/**
* 附件地址
*/
private String enclosureUrl;
/**
* 文件名
*/
private String alias;
/**
* 扩展名
*/
private String extName;
/**
* 状态（0未成功 1成功）
*/
private Integer flStatus;
/**
* 上传时间
*/
private LocalDateTime uploadTime;
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanConsumablesPurchaseMapper.java
View file @ 914542a3
......@@ -27,4 +27,5 @@ public interface PlanConsumablesPurchaseMapper extends BaseMapper<PlanConsumable
PlanConsumablesPurchaseVo getDetail(Integer id);
List<PlanConsumablesPurchaseVo> exportWordList(@Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanEquipmentPurchaseMapper.java
View file @ 914542a3
......@@ -27,4 +27,8 @@ public interface PlanEquipmentPurchaseMapper extends BaseMapper<PlanEquipmentPur
PlanEquipmentPurchaseVo getDetail(Integer id);
/**
* @return
*/
List<PlanEquipmentPurchaseVo> exportWordList(@Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanStandardPurchaseMapper.java
View file @ 914542a3
......@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.PlanStandardPurchase;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
import cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -27,4 +28,6 @@ public interface PlanStandardPurchaseMapper extends BaseMapper<PlanStandardPurch
PlanStandardPurchaseVo getDetail(Integer id);
List<PlanStandardPurchaseVo> wordList( @Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleMapper.java
View file @ 914542a3
......@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.Sample;
import cn.wise.sc.cement.business.model.SampleSaveDto;
import cn.wise.sc.cement.business.model.SampleWord;
import cn.wise.sc.cement.business.model.vo.SampleManageVo;
import cn.wise.sc.cement.business.model.vo.SampleVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -58,4 +60,6 @@ public interface SampleMapper extends BaseMapper<Sample> {
List<Sample> getSampleCheckList(Integer entrustId);
List<SampleSaveDto> getSampleSaveList();
List<SampleWord> exportWordList(@Param("start") Date start, @Param("end") Date end);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SupplierEnclosureMapper.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SupplierEnclosure;
import cn.wise.sc.cement.business.entity.SysUserEnclosure;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-11-21
*/
public interface SupplierEnclosureMapper extends BaseMapper<SupplierEnclosure> {
IPage<SupplierEnclosure> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentUseMapper.xml
View file @ 914542a3
......@@ -13,6 +13,9 @@
<if test="params.name != null and params.name != ''">
and e.name like concat('%', #{params.name}, '%')
</if>
<if test="params.code != null and params.code != ''">
and e.code = #{params.code}
</if>
</where>
</sql>
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApplyMapper.xml
View file @ 914542a3
......@@ -21,7 +21,7 @@
FROM nonstandard_apply na
LEFT JOIN sys_user su ON su.id = na.user_id
<include refid="where"/>
order by na.id asc
order by na.start_time desc
</select>
<select id="getList" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApplyVo">
......@@ -29,7 +29,7 @@
from nonstandard_apply na
LEFT JOIN sys_user su ON su.id = na.user_id
<include refid="where"/>
order by na.id asc
order by na.start_time desc
</select>
<select id="getById" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApplyVo">
......@@ -37,7 +37,7 @@
FROM nonstandard_apply na
LEFT JOIN sys_user su ON na.user_id = su.id
<include refid="where"/>
ORDER BY na.id ASC
order by na.start_time desc
</select>
<select id="exportList" resultType="java.util.HashMap">
......@@ -46,7 +46,7 @@
su.name as 姓名,
su.username as 账户,
na.statistical as 起止日期,
na.reported_hours as 上报工时,
na.reported_hours as 上报工日,
(
CASE na.status
WHEN 0 THEN '未申请'
......@@ -61,6 +61,6 @@
FROM nonstandard_apply na
LEFT JOIN sys_user su ON su.id = na.user_id
<include refid="where"/>
ORDER BY na.id ASC
order by na.start_time desc
</select>
</mapper>
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApprovalMapper.xml
View file @ 914542a3
......@@ -25,14 +25,14 @@
LEFT JOIN sys_user su ON su.id = na.user_id
<include refid="where"/>
<where> na.`status` != 0</where>
order by na.id asc
order by na.start_time desc
</select>
<select id="getList" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApprovalVo">
select na.*,su.name as name,su.username as account
from nonstandard_apply na
LEFT JOIN sys_user su ON su.id = na.user_id
order by na.id asc
order by na.start_time desc
</select>
<select id="getById" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApprovalVo">
......@@ -40,7 +40,7 @@
FROM nonstandard_apply na
LEFT JOIN sys_user su ON na.user_id = su.id
<include refid="where"/>
ORDER BY na.id ASC
order by na.start_time desc
</select>
<select id="exportList" resultType="java.util.HashMap">
......@@ -49,7 +49,8 @@
su.name as 姓名,
su.username as 账户,
na.statistical as 起止日期,
na.approval_hours as 审批工时,
na.reported_hours as 上报工日,
na.approval_hours as 审批工日,
(
CASE na.status
WHEN 0 THEN '未提交'
......@@ -59,12 +60,11 @@
END
)as 状态,
na.final_value as 最终产值,
na.appraisal_value as 考核公值,
na.final_rejection as 驳回意见
FROM nonstandard_apply na
left join sys_user su on na.user_id = su.id
<include refid="where"/>
ORDER BY na.id ASC
order by na.start_time desc
</select>
</mapper>
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml
View file @ 914542a3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wise.sc.cement.business.mapper.NonStandardValueMapper">
<sql id="where">
<where>
<if test="params.name != null and params.name != ''">
......@@ -24,7 +23,6 @@
</if>
</where>
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">
select na.*,su.name as name,su.username as account,su.group_id as groups,sg.name as groupname
from nonstandard_apply na
......@@ -33,7 +31,6 @@
<include refid="where"/>
order by na.start_time desc
</select>
<select id="getList" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">
select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as
groupname
......@@ -43,7 +40,6 @@
<include refid="where"/>
order by na.start_time desc
</select>
<!-- <select id="getByUserId" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">-->
<!-- select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as-->
<!-- groupname-->
......@@ -53,25 +49,24 @@
<!-- <include refid="where"/>-->
<!-- order by na.id asc-->
<!-- </select>-->
<select id="exportList" resultType="java.util.HashMap">
SELECT
na.id as 序号,
su.name as 姓名,
su.username as 账户,
na.statistical as 起止日期,
na.approval_hours as 审批工时,
na.reported_hours as 上报工日,
na.approval_hours as 审批工日,
na.final_value as 最终产值,
na.work_type as 工作类别,
na.work_description as 工作描述,
na.start_time as 开始时间,
su.group_id as 部门id,
sg.name as 部门名
FROM nonstandard_apply na
left join sys_user su on na.user_id = su.id
LEFT JOIN sys_group sg ON sg.id = su.group_id
<include refid="where"/>
ORDER BY na.id ASC
order by na.start_time desc
</select>
</mapper>
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanConsumablesPurchaseMapper.xml
View file @ 914542a3
......@@ -12,6 +12,23 @@
</if>
</where>
</sql>
<sql id="whereNew">
<where>
<if test="params.status != null">
and t.status = #{params.status}
</if>
<if test="params.name != null and params.name != ''">
and t.name like concat('%', #{params.name}, '%')
</if>
<if test="params.start !=null">
and t.create_time <![CDATA[>=]]> #{params.start}
</if>
<if test="params.end !=null">
and t.create_time <![CDATA[<=]]> #{params.end}
</if>
</where>
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo">
SELECT t.*, su.name as purchaserName
......@@ -48,4 +65,12 @@
WHERE t.id = #{id}
</select>
<select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo">
SELECT t.*, su.name as purchaserName
FROM plan_consumables_purchase t
left join sys_user su on su.id = t.purchaser_id
<include refid="whereNew"/>
ORDER BY t.id DESC
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentPurchaseMapper.xml
View file @ 914542a3
......@@ -13,6 +13,23 @@
</where>
</sql>
<sql id="whereNew">
<where>
<if test="params.status != null">
and t.status = #{params.status}
</if>
<if test="params.name != null and params.name != ''">
and t.name like concat('%', #{params.name}, '%')
</if>
<if test="params.start !=null">
and t.create_time <![CDATA[>=]]> #{params.start}
</if>
<if test="params.end !=null">
and t.create_time <![CDATA[<=]]> #{params.end}
</if>
</where>
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo">
SELECT t.*, su.name as purchaserName
FROM plan_equipment_purchase t
......@@ -48,5 +65,13 @@
WHERE t.id = #{id}
</select>
<select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo">
SELECT t.*, su.name as purchaserName
FROM plan_equipment_purchase t
left join sys_user su on su.id = t.purchaser_id
<include refid="whereNew"/>
ORDER BY t.id DESC
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanStandardPurchaseMapper.xml
View file @ 914542a3
......@@ -16,6 +16,23 @@
</where>
</sql>
<sql id="whereNew">
<where>
<if test="params.status != null">
and t.status = #{params.status}
</if>
<if test="params.name != null and params.name != ''">
and t.name like concat('%', #{params.name}, '%')
</if>
<if test="params.start !=null">
and t.create_time <![CDATA[>=]]> #{params.start}
</if>
<if test="params.end !=null">
and t.create_time <![CDATA[<=]]> #{params.end}
</if>
</where>
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo">
SELECT t.*, su.name as purchaserName
FROM plan_standard_purchase t
......@@ -47,5 +64,12 @@
left join sys_user su2 on su2.id = t.user_id
WHERE t.id = #{id}
</select>
<select id="wordList" resultType="cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo">
SELECT t.*, su.name as purchaserName
FROM plan_standard_purchase t
left join sys_user su on su.id = t.purchaser_id
<include refid="whereNew"/>
ORDER BY t.id DESC
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleMapper.xml
View file @ 914542a3
......@@ -85,5 +85,25 @@
ON su.id = s.operator_id
</select>
<select id="exportWordList" resultType="cn.wise.sc.cement.business.model.SampleWord">
SELECT
e.project_name AS project_name,
e.entrust_code,
s.`name`,
s.cement_code,
s.weight,
s.original_position,
date_format(s.create_time, '%Y/%m/%d') as create_time,
s.remark,
date_format(s.destruction_time, '%Y/%m/%d') as destruction_time,
su.`name` AS user_name
FROM
`sample` s
LEFT JOIN entrust e ON s.entrust_id = e.id
LEFT JOIN sys_user su ON su.id = s.operator_id
where s.create_time <![CDATA[>=]]> #{start}
and s.create_time <![CDATA[<=]]> #{end}
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SupplierEnclosureMapper.xml 0 → 100644
View file @ 914542a3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wise.sc.cement.business.mapper.SupplierEnclosureMapper">
<select id="getPage" resultType="cn.wise.sc.cement.business.entity.SupplierEnclosure">
select se.*
from supplier_enclosure se
<if test="params.supplierId != null">
where se.supplier_id = #{params.supplierId}
</if>
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/model/SampleWord.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.model;
import lombok.Data;
/**
* @description: 样品导出word
* @author: qh
* @create: 2020-11-20 16:34
**/
@Data
public class SampleWord {
private String projectName = "";
private String name = "";
private String cementCode = "";
private String weight = "";
private String originalPosition = "";
private String createTime = "";
private String remark = "";
private String destructionTime = "";
private String userName = "";
private String entrustCode = "";
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ChangeStockQuery.java
View file @ 914542a3
......@@ -24,8 +24,11 @@ public class ChangeStockQuery {
/**
* 新增数量 / 领用数量
*/
@ApiModelProperty("改变数量")
private BigDecimal changeNum;
@ApiModelProperty("入库数量（单位 瓶）")
private Integer enterNum;
@ApiModelProperty("领用数量（单位 g）")
private BigDecimal outNum;
@ApiModelProperty("备注")
private String remark;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/PlanFinishQuery.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* @description:
* @author: qh
* @create: 2020-09-29
**/
@Data
@ApiModel("完成-设备采购计划请求")
public class PlanFinishQuery {
private Integer id;
@ApiModelProperty("实施情况")
private String implementation;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/StandardQuery.java
View file @ 914542a3
......@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
import java.math.BigDecimal;
......@@ -32,6 +33,9 @@ public class StandardQuery {
@ApiModelProperty("购买厂商（经销单位）")
private String supplierName;
@ApiModelProperty("生产日期")
private LocalDate productionDate;
@ApiModelProperty("进样日期")
private LocalDate purchaseDate;
......@@ -41,11 +45,14 @@ public class StandardQuery {
@ApiModelProperty("存储位置")
private String position;
@ApiModelProperty("库存数量")
private BigDecimal stockNum;
@ApiModelProperty("入库数量 （单位：瓶）")
private Integer enterNum;
@ApiModelProperty("多少g/瓶")
private BigDecimal unitStock;
@ApiModelProperty("库存提醒数量（少于多少进行提醒）")
private BigDecimal leastNum;
private Integer leastNum;
@ApiModelProperty("备注")
private String remark;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SupplierEnclosureQuery.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 人员管理附件
* @author: wlb
* @create: 2020-10-19
**/
@Data
@ApiModel("供应商管理附件")
public class SupplierEnclosureQuery {
@ApiModelProperty("供应商id")
private Integer supplierId;
@ApiModelProperty("文件名")
private String alias;
@ApiModelProperty("扩展名")
private String extName;
@ApiModelProperty("路径")
private String enclosureUrl;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanConsumablesPurchaseVo.java
View file @ 914542a3
......@@ -57,10 +57,15 @@ public class PlanConsumablesPurchaseVo {
@ApiModelProperty("状态（0禁用，1已启用）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
private String createTimeStr;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentMaintainVo.java
View file @ 914542a3
......@@ -63,6 +63,9 @@ public class PlanEquipmentMaintainVo {
@ApiModelProperty("状态（0待完成，1已完成）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentPurchaseVo.java
View file @ 914542a3
......@@ -57,10 +57,15 @@ public class PlanEquipmentPurchaseVo {
@ApiModelProperty("状态（0待完成，1已完成）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
private String createTimeStr;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentRepairVo.java
View file @ 914542a3
......@@ -54,6 +54,9 @@ public class PlanEquipmentRepairVo {
@ApiModelProperty("状态（0待完成，1已完成）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanStandardPurchaseVo.java
View file @ 914542a3
......@@ -54,10 +54,15 @@ public class PlanStandardPurchaseVo {
@ApiModelProperty("状态（0禁用，1已启用）")
private Integer status;
@ApiModelProperty("实施情况")
private String implementation;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
private String createTimeStr;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleVo.java
View file @ 914542a3
......@@ -106,4 +106,6 @@ public class SampleVo {
@ApiModelProperty("产地")
private String origin;
private String createTime;
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEquipmentService.java
View file @ 914542a3
......@@ -60,8 +60,8 @@ public interface IEquipmentService extends IService<Equipment> {
BaseResponse<EquipmentScrapVo> getscrapApprovalDetail(Integer id);
BaseResponse<IPage<EquipmentUseVo>> getUsePage(PageQuery pageQuery,
String brand, Integer supplierId, String name);
String brand, Integer supplierId, String name,String code);
void exportUse(String brand, Integer supplierId, String name, String fileName, HttpServletResponse response);
void exportUse(String brand, Integer supplierId, String name, String code, String fileName, HttpServletResponse response);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardValueService.java
View file @ 914542a3
......@@ -27,7 +27,7 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
* @param pageQuery 非标产值信息分页
* @return IPage<NoneStandardValue>
*/
BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId, String name,Date start, Date end);
BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId, String name,Date startParse,Date endParse);
/* //计算每个用户提交的非标产值
......@@ -48,7 +48,7 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
*
* @return List
*/
BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups,String name);
BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups, String name);
/**
* 非标产值列表导出
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanConsumablesPurchaseService.java
View file @ 914542a3
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.PlanConsumablesPurchase;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -30,8 +31,13 @@ public interface IPlanConsumablesPurchaseService extends IService<PlanConsumable
BaseResponse<PlanConsumablesPurchaseVo> getDetail(Integer id);
BaseResponse<String> finish(Integer id);
BaseResponse<String> finish(PlanFinishQuery query);
BaseResponse<String> delete(Integer id);
/**
* 导出word
* @param response
*/
void exportWord(HttpServletResponse response);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanEquipmentMaintainService.java
View file @ 914542a3
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.PlanEquipmentMaintain;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentMaintainQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentMaintainVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -30,7 +31,7 @@ public interface IPlanEquipmentMaintainService extends IService<PlanEquipmentMai
BaseResponse<PlanEquipmentMaintainVo> getDetail(Integer id);
BaseResponse<String> finish(Integer id);
BaseResponse<String> finish(PlanFinishQuery query);
BaseResponse<String> delete(Integer id);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanEquipmentPurchaseService.java
View file @ 914542a3
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.PlanEquipmentPurchase;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -20,9 +21,9 @@ import javax.servlet.http.HttpServletResponse;
*/
public interface IPlanEquipmentPurchaseService extends IService<PlanEquipmentPurchase> {
BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name);
BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name, Integer status);
void export(String name, String fileName, HttpServletResponse response);
void export(String name, String fileName, Integer status, HttpServletResponse response);
BaseResponse<PlanEquipmentPurchase> create(PlanEquipmentPurchaseQuery query);
......@@ -30,8 +31,9 @@ public interface IPlanEquipmentPurchaseService extends IService<PlanEquipmentPur
BaseResponse<PlanEquipmentPurchaseVo> getDetail(Integer id);
BaseResponse<String> finish(Integer id);
BaseResponse<String> finish(PlanFinishQuery query);
BaseResponse<String> delete(Integer id);
void exportWord(HttpServletResponse response);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanEquipmentRepairService.java
View file @ 914542a3
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.PlanEquipmentRepair;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentRepairQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentRepairVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -31,7 +32,7 @@ public interface IPlanEquipmentRepairService extends IService<PlanEquipmentRepai
BaseResponse<PlanEquipmentRepairVo> getDetail(Integer id);
BaseResponse<String> finish(Integer id);
BaseResponse<String> finish(PlanFinishQuery query);
BaseResponse<String> delete(Integer id);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanStandardPurchaseService.java
View file @ 914542a3
......@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.PlanStandardPurchase;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
import cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -30,8 +31,9 @@ public interface IPlanStandardPurchaseService extends IService<PlanStandardPurch
BaseResponse<PlanStandardPurchaseVo> getDetail(Integer id);
BaseResponse<String> finish(Integer id);
BaseResponse<String> finish(PlanFinishQuery query);
BaseResponse<String> delete(Integer id);
void exportWord(HttpServletResponse response);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleService.java
View file @ 914542a3
......@@ -52,4 +52,10 @@ public interface ISampleService extends IService<Sample> {
* @param response 响应体
*/
void upload(HttpServletResponse response);
/**
* 导出样品销毁记录 word
* @param response
*/
void exportWord(HttpServletResponse response);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IStandardService.java
View file @ 914542a3
......@@ -42,6 +42,8 @@ public interface IStandardService extends IService<Standard> {
BaseResponse<String> out(ChangeStockQuery query);
BaseResponse<String> checkStockNum();
BaseResponse<String> changeValidDate(ChangeValidDateQuery query);
BaseResponse<String> overdue(Integer id);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISupplierEnclosureService.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SupplierEnclosure;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-11-21
*/
public interface ISupplierEnclosureService extends IService<SupplierEnclosure> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISupplierService.java
View file @ 914542a3
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.Supplier;
import cn.wise.sc.cement.business.entity.SupplierEnclosure;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.SupplierQuery;
import cn.wise.sc.cement.business.model.query.SupplierEnclosureQuery;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -23,4 +25,10 @@ public interface ISupplierService extends IService<Supplier> {
BaseResponse<Supplier> update(SupplierQuery query);
BaseResponse<String> upload(SupplierEnclosureQuery query);
BaseResponse<IPage<SupplierEnclosure>> getEnclosurePage(PageQuery pageQuery, Integer supplierId);
BaseResponse<String> deleteEnclosure(Integer id);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ConsumablesServiceImpl.java
View file @ 914542a3
......@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -135,6 +136,12 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在");
}
if(query.getEnterNum() != null && query.getUnitStock() != null){
BigDecimal stockNum = new BigDecimal(query.getEnterNum()).multiply(query.getUnitStock());
query.setStockNum(stockNum);
}else{
query.setStockNum(new BigDecimal(0));
}
query.setCreateTime(LocalDateTime.now())
.setStatus(1);
consumablesMapper.insert(query);
......@@ -143,7 +150,7 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
ConsumablesEnter enter = new ConsumablesEnter();
enter.setConsumablesId(query.getId())
.setUserId(loginUser.getId())
.setEnterNum(query.getStockNum())
.setEnterNum(query.getEnterNum())
.setCreateTime(LocalDateTime.now())
.setRemark("新增消耗品");
consumablesEnterMapper.insert(enter);
......@@ -192,11 +199,11 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
ConsumablesEnter enter = new ConsumablesEnter();
enter.setConsumablesId(consumables.getId())
.setUserId(userService.getLoginUser().getId())
.setEnterNum(query.getChangeNum())
.setEnterNum(query.getEnterNum())
.setCreateTime(LocalDateTime.now())
.setRemark(query.getRemark());
consumablesEnterMapper.insert(enter);
consumables.setStockNum(consumables.getStockNum().add(enter.getEnterNum()));
consumables.setStockNum(consumables.getStockNum().add( consumables.getUnitStock().multiply(new BigDecimal(enter.getEnterNum()))));
consumablesMapper.updateById(consumables);
return BaseResponse.okData("新增入库完成");
}
......@@ -220,7 +227,7 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
ConsumablesOut out = new ConsumablesOut();
out.setConsumablesId(consumables.getId())
.setUserId(userService.getLoginUser().getId())
.setCollectNum(query.getChangeNum())
.setCollectNum(query.getOutNum())
.setCreateTime(LocalDateTime.now())
.setRemark(query.getRemark());
consumablesOutMapper.insert(out);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ 914542a3
......@@ -1357,7 +1357,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//计算产值
if (sampleHandle.getHandleId() != null) {
try {
iPrecipriceService.createPreciprice(sampleHandle.getUserId(),entrust.getId(),sampleHandle.getHandleId(),0,sample.getId(),true);
iPrecipriceService.createPreciprice(sampleHandle.getUserId(),entrust.getId(),sampleHandle.getHandleId(),0,sample.getId(),false);
}catch (Exception e){
System.out.println(e.getMessage());
return BaseResponse.errorMsg(e.getMessage());
......@@ -1728,7 +1728,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (sampleDistributionTeamGroupVoList != null && sampleDistributionTeamGroupVoList.size() > 0) {
for (SampleDistributionTeamVo sdVo : sampleDistributionTeamGroupVoList) {
try {
iPrecipriceService.createPreciprice(sdVo.getUserId(),entrust.getId(),sdVo.getTeamGroupId(),1,sample.getId(),true);
iPrecipriceService.createPreciprice(sdVo.getUserId(),entrust.getId(),sdVo.getTeamGroupId(),1,sample.getId(),false);
}catch (Exception e){
return BaseResponse.errorMsg(e.getMessage());
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java
View file @ 914542a3
......@@ -308,9 +308,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
//当前日期
LocalDate nowDate = LocalDate.now();
for(Equipment eq : equipmentList ){
//检定到期日期 = 上次检定日期+周期的值 - 7 （提前一周提醒）
//检定到期日期 = 上次检定日期+周期的值 - 一个月 （提前一一个月提醒）
if(eq.getTestDate() != null && eq.getTestCycle() != null){
LocalDate expireDate = eq.getTestDate().plusYears(Long.valueOf(eq.getTestCycle())).minusWeeks(1);
LocalDate expireDate = eq.getTestDate().plusYears(Long.valueOf(eq.getTestCycle())).minusMonths(1);
//如果当前日期等于检定到期日期 或者 当前日期大于检定到期日期，提示设备检定人员检定设备
if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
//发送企业微信消息内容
......@@ -501,6 +501,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
} else {
scrapMapper.updateById(equipmentScrap);
}
Equipment eq = equipmentMapper.selectById(equipmentVo.getId());
eq.setStatus(0);
equipmentMapper.updateById(eq);
return BaseResponse.okData("设备报废申请完成");
}
......@@ -531,6 +534,13 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
}
equipment.setStatus(3);//报废状态
equipmentMapper.updateById(equipment);
}else{
Equipment equipment = equipmentMapper.selectById(equipmentScrap.getEquipmentId());
if (equipment == null) {
return BaseResponse.errorMsg("信息错误!");
}
equipment.setStatus(1);//启用状态
equipmentMapper.updateById(equipment);
}
return BaseResponse.okData("审批完成");
}
......@@ -630,11 +640,13 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
*/
@Override
public BaseResponse<IPage<EquipmentUseVo>> getUsePage(PageQuery pageQuery,
String brand, Integer supplierId, String name) {
String brand, Integer supplierId, String name,
String code) {
Map<String, Object> params = new HashMap<>();
params.put("brand", brand);
params.put("supplierId", supplierId);
params.put("name", name);
params.put("code", code);
Page<EquipmentUseVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<EquipmentUseVo> pages = useMapper.getPage(page, params);
return BaseResponse.okData(pages);
......@@ -650,11 +662,12 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
* @param response
*/
@Override
public void exportUse(String brand, Integer supplierId, String name, String fileName, HttpServletResponse response) {
public void exportUse(String brand, Integer supplierId, String name, String code, String fileName, HttpServletResponse response) {
Map<String, Object> params = new HashMap<>();
params.put("brand", brand);
params.put("supplierId", supplierId);
params.put("name", name);
params.put("code", code);
List<Map<String, Object>> list = scrapMapper.exportList(params);
if (!CollectionUtils.isEmpty(list)) {
Map<String, Object> map = list.get(0);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java
View file @ 914542a3
......@@ -143,7 +143,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
headers[1] = "姓名";
headers[2] = "账户";
headers[3] = "起止日期";
headers[4] = "上报工时";
headers[4] = "上报工日";
headers[5] = "状态";
headers[6] = "工作类别";
headers[7] = "工作描述";
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java
View file @ 914542a3
......@@ -158,10 +158,10 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
headers[1] = "姓名";
headers[2] = "账户";
headers[3] = "起止日期";
headers[4] = "审批工时";
headers[5] = "状态";
headers[6] = "最终产值";
headers[7] = "考核公值";
headers[4] = "上报工日";
headers[5] = "审批工日";
headers[6] = "状态";
headers[7] = "最终产值";
headers[8] = "驳回意见";
List<Object[]> datas = new ArrayList<>(list.size());
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java
View file @ 914542a3
......@@ -30,6 +30,7 @@ import java.util.*;
*/
@Service
public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMapper, NonStandardValue> implements INonStandardValueService {
@Resource
private NonStandardValueMapper nonStandardValueMapper;
......@@ -162,11 +163,11 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
headers[1] = "姓名";
headers[2] = "账户";
headers[3] = "起止日期";
headers[4] = "审批工时";
headers[5] = "最终产值";
headers[6] = "工作类别";
headers[7] = "工作描述";
headers[8] = "开始时间";
headers[4] = "上报工日";
headers[5] = "审批工日";
headers[6] = "最终产值";
headers[7] = "工作类别";
headers[8] = "工作描述";
headers[9] = "部门id";
headers[10] = "部门名";
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanConsumablesPurchaseServiceImpl.java
View file @ 914542a3
package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.wise.sc.cement.business.entity.PlanConsumablesPurchase;
import cn.wise.sc.cement.business.entity.PlanEquipmentPurchase;
import cn.wise.sc.cement.business.enumation.FileExt;
import cn.wise.sc.cement.business.mapper.PlanConsumablesPurchaseMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
import cn.wise.sc.cement.business.service.IPlanConsumablesPurchaseService;
import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.ExcelUtil;
import cn.wise.sc.cement.business.util.WordUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -185,19 +190,20 @@ public class PlanConsumablesPurchaseServiceImpl extends ServiceImpl<PlanConsumab
/**
* 采购完成
*
* @param id
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<String> finish(Integer id) {
if (id == null) {
public BaseResponse<String> finish(PlanFinishQuery query) {
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误!");
}
PlanConsumablesPurchase pep = consumablesPurchaseMapper.selectById(id);
PlanConsumablesPurchase pep = consumablesPurchaseMapper.selectById(query.getId());
if (pep == null) {
return BaseResponse.errorMsg("数据错误!");
}
pep.setTechnicalIndex(query.getImplementation());
pep.setStatus(1); //采购完成
consumablesPurchaseMapper.updateById(pep);
return BaseResponse.okData("采购完成");
......@@ -219,4 +225,22 @@ public class PlanConsumablesPurchaseServiceImpl extends ServiceImpl<PlanConsumab
return BaseResponse.okData("删除成功");
}
@Override
public void exportWord(HttpServletResponse response) {
Map<String, Object> params = new HashMap<>();
Page page = new Page();
page.setSize(-1);
List<PlanConsumablesPurchaseVo> records = consumablesPurchaseMapper.getPage(page, params).getRecords();
if (CollectionUtil.isEmpty(records)) {
log.debug("没有找到数据!");
}
Map<String, Object> beanParams = new HashMap<>();
records.add(records.get(0));
beanParams.put("list", records);
beanParams.put("fileNo","");
beanParams.put("year", DateUtil.year(DateUtil.date()) +"");
WordUtil.writeWordReport("消耗品采购计划.docx", "消耗品采购计划.ftl", beanParams, response, FileExt.DOC);
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentMaintainServiceImpl.java
View file @ 914542a3
......@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentMaintainQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentMaintainVo;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
import cn.wise.sc.cement.business.service.IPlanEquipmentMaintainService;
......@@ -184,19 +185,20 @@ public class PlanEquipmentMaintainServiceImpl extends ServiceImpl<PlanEquipmentM
/**
* 维护完成
*
* @param id
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<String> finish(Integer id) {
if (id == null) {
public BaseResponse<String> finish(PlanFinishQuery query) {
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误!");
}
PlanEquipmentMaintain pep = equipmentMaintainMapper.selectById(id);
PlanEquipmentMaintain pep = equipmentMaintainMapper.selectById(query.getId());
if (pep == null) {
return BaseResponse.errorMsg("数据错误!");
}
pep.setImplementation(query.getImplementation());
pep.setStatus(1); //维护完成
equipmentMaintainMapper.updateById(pep);
return BaseResponse.okData("维护完成");
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentPurchaseServiceImpl.java
View file @ 914542a3
package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.PlanEquipmentPurchase;
import cn.wise.sc.cement.business.entity.SysRole;
import cn.wise.sc.cement.business.entity.Team;
import cn.wise.sc.cement.business.enumation.FileExt;
import cn.wise.sc.cement.business.mapper.PlanEquipmentPurchaseMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.query.RoleQuery;
import cn.wise.sc.cement.business.model.query.TeamQuery;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
......@@ -16,6 +21,7 @@ import cn.wise.sc.cement.business.model.vo.TeamVo;
import cn.wise.sc.cement.business.service.IPlanEquipmentPurchaseService;
import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.ExcelUtil;
import cn.wise.sc.cement.business.util.WordUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -30,7 +36,9 @@ import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -59,9 +67,10 @@ public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentP
* @return
*/
@Override
public BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name) {
public BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name, Integer status) {
Map<String, Object> params = new HashMap<>();
params.put("name", name);
params.put("status", status);
Page<PlanEquipmentPurchaseVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<PlanEquipmentPurchaseVo> pages = equipmentPurchaseMapper.getPage(page, params);
return BaseResponse.okData(pages);
......@@ -72,12 +81,14 @@ public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentP
*
* @param name
* @param fileName
* @param status
* @param response
*/
@Override
public void export(String name, String fileName, HttpServletResponse response) {
public void export(String name, String fileName, Integer status, HttpServletResponse response) {
Map<String, Object> params = new HashMap<>();
params.put("name", name);
params.put("status", status);
List<Map<String, Object>> list = equipmentPurchaseMapper.exportList(params);
if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(list)) {
......@@ -189,19 +200,20 @@ public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentP
/**
* 采购完成
*
* @param id
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<String> finish(Integer id) {
if (id == null) {
public BaseResponse<String> finish(PlanFinishQuery query) {
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误!");
}
PlanEquipmentPurchase pep = equipmentPurchaseMapper.selectById(id);
PlanEquipmentPurchase pep = equipmentPurchaseMapper.selectById(query.getId());
if (pep == null) {
return BaseResponse.errorMsg("数据错误!");
}
pep.setImplementation(query.getImplementation());
pep.setStatus(1); //采购完成
equipmentPurchaseMapper.updateById(pep);
return BaseResponse.okData("采购完成");
......@@ -223,4 +235,36 @@ public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentP
return BaseResponse.okData("删除成功");
}
@Override
public void exportWord(HttpServletResponse response) {
Date start = DateUtil.beginOfYear(DateUtil.date());
Date end = DateUtil.endOfYear(DateUtil.date());
Map<String, Object> map = new HashMap<>(2);
map.put("start", start);
map.put("end", end);
List<PlanEquipmentPurchaseVo> list = equipmentPurchaseMapper.exportWordList(map);
if (CollectionUtil.isEmpty(list)) {
log.debug("采购计划为空!");
return;
}
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
list.forEach(arg -> {
if (StrUtil.isEmpty(arg.getRemark())) {
arg.setRemark("");
}
arg.setCreateTimeStr(arg.getCreateTime().format(dateTimeFormatter));
});
Map<String, Object> params = new HashMap<>(5);
params.put("list", list);
params.put("fileNo", "");
params.put("year", DateUtil.year(DateUtil.date()));
WordUtil.writeWordReport("消耗品采购计划", "消耗品采购计划.ftl", params, response, FileExt.DOC);
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentRepairServiceImpl.java
View file @ 914542a3
......@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanEquipmentRepairQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
import cn.wise.sc.cement.business.model.vo.PlanEquipmentRepairVo;
import cn.wise.sc.cement.business.service.IPlanEquipmentRepairService;
......@@ -184,19 +185,20 @@ public class PlanEquipmentRepairServiceImpl extends ServiceImpl<PlanEquipmentRep
/**
* 维修完成
*
* @param id
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<String> finish(Integer id) {
if (id == null) {
public BaseResponse<String> finish(PlanFinishQuery query) {
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误!");
}
PlanEquipmentRepair pep = equipmentRepairMapper.selectById(id);
PlanEquipmentRepair pep = equipmentRepairMapper.selectById(query.getId());
if (pep == null) {
return BaseResponse.errorMsg("数据错误!");
}
pep.setImplementation(query.getImplementation());
pep.setStatus(1); //维修完成
equipmentRepairMapper.updateById(pep);
return BaseResponse.okData("维修完成");
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanStandardPurchaseServiceImpl.java
View file @ 914542a3
package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.PlanConsumablesPurchase;
import cn.wise.sc.cement.business.entity.PlanStandardPurchase;
import cn.wise.sc.cement.business.enumation.FileExt;
import cn.wise.sc.cement.business.mapper.PlanStandardPurchaseMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
import cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo;
import cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo;
import cn.wise.sc.cement.business.service.IPlanStandardPurchaseService;
import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.ExcelUtil;
import cn.wise.sc.cement.business.util.WordUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -26,7 +32,9 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -183,19 +191,20 @@ public class PlanStandardPurchaseServiceImpl extends ServiceImpl<PlanStandardPur
/**
* 采购完成
*
* @param id
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<String> finish(Integer id) {
if (id == null) {
public BaseResponse<String> finish(PlanFinishQuery query) {
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误!");
}
PlanStandardPurchase pep = standardPurchaseMapper.selectById(id);
PlanStandardPurchase pep = standardPurchaseMapper.selectById(query.getId());
if (pep == null) {
return BaseResponse.errorMsg("数据错误!");
}
pep.setImplementation(query.getImplementation());
pep.setStatus(1); //采购完成
standardPurchaseMapper.updateById(pep);
return BaseResponse.okData("采购完成");
......@@ -217,4 +226,36 @@ public class PlanStandardPurchaseServiceImpl extends ServiceImpl<PlanStandardPur
return BaseResponse.okData("删除成功");
}
@Override
public void exportWord(HttpServletResponse response) {
Date start = DateUtil.beginOfYear(DateUtil.date());
Date end = DateUtil.endOfYear(DateUtil.date());
Map<String, Object> map = new HashMap<>();
map.put("start", start);
map.put("end", end);
List<PlanStandardPurchaseVo> planStandardPurchaseVos = standardPurchaseMapper.wordList(map);
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/mm");
planStandardPurchaseVos.forEach(arg -> {
arg.setCreateTimeStr(arg.getCreateTime().format(dateTimeFormatter));
if (StrUtil.isEmpty(arg.getRemark())){
arg.setRemark("");
}
});
if (CollectionUtil.isEmpty(planStandardPurchaseVos)) {
log.debug("没找到数据!");
return;
}
Map<String, Object> params = new HashMap<>(1);
params.put("list", planStandardPurchaseVos);
params.put("fileNo", "2020-000001");
params.put("year", DateUtil.year(DateUtil.date()) + "");
WordUtil.writeWordReport("标准物质采购计划", "标准物质采购计划.ftl", params, response, FileExt.DOC);
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleServiceImpl.java
View file @ 914542a3
package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.Sample;
import cn.wise.sc.cement.business.enumation.FileExt;
import cn.wise.sc.cement.business.mapper.SampleMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.SampleSaveDto;
import cn.wise.sc.cement.business.model.SampleWord;
import cn.wise.sc.cement.business.model.query.SampleManageQuery;
import cn.wise.sc.cement.business.model.vo.SampleVo;
import cn.wise.sc.cement.business.service.ISampleService;
import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.ExcelUtil;
import cn.wise.sc.cement.business.util.WordUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -24,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -254,7 +260,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
String obj;
if (j < 7) {
obj = m.get(headers[j]) == null ? "—" : m.get(headers[j]).toString();
}else {
} else {
obj = m.get(headers[j]) == null ? "" : m.get(headers[j]).toString();
}
//如果序号带小数点 去除.0,保留整数
......@@ -270,4 +276,24 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
}
}
@Override
public void exportWord(HttpServletResponse response) {
Date start = DateUtil.beginOfYear(DateUtil.date());
Date end = DateUtil.endOfYear(DateUtil.date());
List<SampleWord> list = sampleMapper.exportWordList(start, end);
if (CollectionUtil.isEmpty(list)) {
log.debug("没找到数据!");
}
Map<String, Object> params = new HashMap<>(1);
params.put("list", list);
params.put("fileNo","");
WordUtil.writeWordReport("原料存放、销毁记录", "原料存放、销毁记录.ftl", params, response, FileExt.DOC);
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java
View file @ 914542a3
......@@ -3,10 +3,7 @@ package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.*;
import cn.wise.sc.cement.business.mapper.EntityEnclosureMapper;
import cn.wise.sc.cement.business.mapper.StandardEnterMapper;
import cn.wise.sc.cement.business.mapper.StandardMapper;
import cn.wise.sc.cement.business.mapper.StandardOutMapper;
import cn.wise.sc.cement.business.mapper.*;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
......@@ -19,6 +16,7 @@ import cn.wise.sc.cement.business.service.IStandardValueService;
import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.ExcelUtil;
import cn.wise.sc.cement.business.util.ObjUtils;
import cn.wise.sc.cement.business.util.weixin.Global;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -28,6 +26,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -35,6 +34,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -70,6 +70,11 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
private CommonServiceImpl commonService;
@Autowired
private ISampleCheckService iSampleCheckService;
@Resource
private SysApprovalMapper sysApprovalMapper;
@Autowired
private WeiXinService weiXinService;
/**
* 分页查询
......@@ -156,6 +161,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
QueryWrapper<Standard> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
int count = standardMapper.selectCount(qw);
......@@ -164,6 +170,12 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
}
Standard standard = new Standard();
BeanUtils.copyProperties(query, standard);
if(query.getEnterNum() != null && query.getUnitStock() != null){
BigDecimal stockNum = new BigDecimal(query.getEnterNum()).multiply(query.getUnitStock());
standard.setStockNum(stockNum);
}else{
standard.setStockNum(new BigDecimal(0));
}
standard.setStatus(1)
.setCreateTime(LocalDateTime.now());
standardMapper.insert(standard);
......@@ -191,7 +203,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
StandardEnter enter = new StandardEnter();
enter.setStandardId(standard.getId())
.setUserId(loginUser.getId())
.setEnterNum(query.getStockNum())
.setEnterNum(query.getEnterNum()) //入库数量 多少瓶
.setCreateTime(LocalDateTime.now())
.setRemark("新增标样");
standardEnterMapper.insert(enter);
......@@ -225,6 +237,10 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
}
Standard standard = new Standard();
BeanUtils.copyProperties(query, standard);
if(query.getEnterNum() != null && query.getUnitStock() != null){
BigDecimal stockNum = new BigDecimal(query.getEnterNum()).multiply(query.getUnitStock());
standard.setStockNum(stockNum);
}
standardMapper.updateById(standard);
//添加标准值
if (query.getStandardValueQueryList() != null && query.getStandardValueQueryList().size() > 0) {
......@@ -329,12 +345,12 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
StandardEnter enter = new StandardEnter();
enter.setStandardId(standard.getId())
.setUserId(userService.getLoginUser().getId())
.setEnterNum(query.getChangeNum())
.setEnterNum(query.getEnterNum())
.setCreateTime(LocalDateTime.now())
.setRemark(query.getRemark());
standardEnterMapper.insert(enter);
standard.setStockNum(standard.getStockNum().add(enter.getEnterNum()));
standard.setStockNum(standard.getStockNum().add(standard.getUnitStock().multiply(new BigDecimal(query.getEnterNum()))));
standardMapper.updateById(standard);
return BaseResponse.okData("新增入库完成");
}
......@@ -358,7 +374,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
StandardOut out = new StandardOut();
out.setStandardId(standard.getId())
.setUserId(userService.getLoginUser().getId())
.setCollectNum(query.getChangeNum())
.setCollectNum(query.getOutNum())
.setCreateTime(LocalDateTime.now())
.setRemark(query.getRemark());
standardOutMapper.insert(out);
......@@ -367,6 +383,61 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
return BaseResponse.okData("领用出库完成");
}
/**
* 判断标样数量是否小于设定的最小值 如果小于等于，进行提醒
* 判断标样是否快过期 过期前15天进行提醒
* @return
*/
@Override
@Scheduled(cron = "0 0 6 * * *")
public BaseResponse<String> checkStockNum(){
//消息推送
List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("标样管理");
if (approvalIdList == null) {
return BaseResponse.errorMsg("标样管理信息错误");
}
String userIds = "";
for(Integer testEQId : approvalIdList ){
SysUser testEQUser = userService.getById(testEQId);
if(testEQUser == null){
return BaseResponse.errorMsg("设备检定信息错误");
}
if(StringUtils.isNotBlank(testEQUser.getWxId())){
userIds = userIds.equals("")?testEQUser.getWxId():userIds+"|"+testEQUser.getWxId();
}
}
QueryWrapper<Standard> qw = new QueryWrapper<>();
qw.eq("status",1);
List<Standard> standardList = standardMapper.selectList(qw);
//当前日期
LocalDate nowDate = LocalDate.now();
for(Standard st : standardList){
if(st.getLeastNum() != null && st.getStockNum() != null){
if(st.getStockNum().compareTo(st.getLeastNum())<1){
//发送企业微信消息内容
String content="你好！标样名称："+st.getName()+"，代号："+st.getCode()+"的标样数量小于设定的最小值，新增标样数量后请及时更新系统，如果已新增完毕请前往\n" +
Global.systemUrl+"更新标样记录。";
System.out.println("**************************content**********************");
System.out.println(content);
weiXinService.sendTextMessage(userIds, content);
}
}
if(st.getValidDate() != null){
LocalDate expireDate = st.getValidDate().minusDays(15);
if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
//发送企业微信消息内容
String content="你好！标样名称："+st.getName()+"，代号："+st.getCode()+"的标样即将过期，请尽快处理，如果已经处理，请前往\n" +
Global.systemUrl+"更新标样记录。";
System.out.println("**************************content**********************");
System.out.println(content);
weiXinService.sendTextMessage(userIds, content);
}
}
}
return BaseResponse.okMsg("成功");
}
/**
* 变更有效期
*
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SupplierEnclosureServiceImpl.java 0 → 100644
View file @ 914542a3
package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.SupplierEnclosure;
import cn.wise.sc.cement.business.mapper.SupplierEnclosureMapper;
import cn.wise.sc.cement.business.service.ISupplierEnclosureService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2020-11-21
*/
@Service
public class SupplierEnclosureServiceImpl extends ServiceImpl<SupplierEnclosureMapper, SupplierEnclosure> implements ISupplierEnclosureService {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SupplierServiceImpl.java
View file @ 914542a3
package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.Supplier;
import cn.wise.sc.cement.business.entity.SysPost;
import cn.wise.sc.cement.business.entity.SupplierEnclosure;
import cn.wise.sc.cement.business.entity.SysUserEnclosure;
import cn.wise.sc.cement.business.mapper.SupplierEnclosureMapper;
import cn.wise.sc.cement.business.mapper.SupplierMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PostQuery;
import cn.wise.sc.cement.business.model.query.SupplierQuery;
import cn.wise.sc.cement.business.model.query.SupplierEnclosureQuery;
import cn.wise.sc.cement.business.service.ISupplierService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jdk.nashorn.internal.ir.annotations.Reference;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.Map;
/**
* <p>
......@@ -34,6 +39,10 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
@Resource
private SupplierMapper supplierMapper;
@Autowired
private UserServiceImpl userService;
@Resource
private SupplierEnclosureMapper supplierEnclosureMapper;
/**
* 获取分页
......@@ -103,4 +112,71 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
return BaseResponse.okData(supplier);
}
/**
* 新增供应商附件信息
* @param query
* @return
*/
@Override
@Transactional
public BaseResponse<String> upload(SupplierEnclosureQuery query) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
if (query == null || query.getSupplierId() == null) {
return BaseResponse.errorMsg("参数错误");
}
SupplierEnclosure supplierEnclosure = new SupplierEnclosure();
supplierEnclosure.setSupplierId(query.getSupplierId())
.setEnclosureUrl(query.getEnclosureUrl())
.setExtName(query.getExtName())
.setAlias(query.getAlias())
.setFlStatus(1)
.setUploadTime(LocalDateTime.now());
supplierEnclosureMapper.insert(supplierEnclosure);
return BaseResponse.okMsg("成功");
}
/**
* 附件列表
* @param pageQuery
* @param supplierId
* @return
*/
@Override
public BaseResponse<IPage<SupplierEnclosure>> getEnclosurePage(PageQuery pageQuery, Integer supplierId) {
if(supplierId == null){
return BaseResponse.errorMsg("请传入供应商id");
}
Map<String, Object> params = new HashMap<>();
params.put("supplierId", supplierId);
Page<SupplierEnclosure> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<SupplierEnclosure> pages = supplierEnclosureMapper.getPage(page, params);
return BaseResponse.okData(pages);
}
/**
* 删除供应商附件
* @param id
* @return
*/
@Transactional
@Override
public BaseResponse<String> deleteEnclosure(Integer id) {
if(id == null){
return BaseResponse.errorMsg("参数错误");
}
SupplierEnclosure suppliernclosure = supplierEnclosureMapper.selectById(id);
if(suppliernclosure == null){
return BaseResponse.errorMsg("附件信息错误");
}
supplierEnclosureMapper.deleteById(id);
return BaseResponse.okData("附件信息删除成功");
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment