chuangte/yh-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报表提交

Browse Source
This commit is contained in:
磷叶 2024-11-05 14:48:42 +08:00
parent c53568c121
commit d4ab393b7c
34 changed files with 1517 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View File

@ -41,10 +41,21 @@ public class BaseEntity implements Serializable
/** 是否需要数据隔离 */
private Boolean needScope;
/** 删除标志 */
private Boolean deleted;
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
public Boolean getDeleted() {
return deleted;
}
public void setDeleted(Boolean deleted) {
this.deleted = deleted;
}
public Boolean getNeedScope() {
return needScope;
}

32
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/SqlUtils.java Normal file
View File

@ -0,0 +1,32 @@
package com.ruoyi.common.utils;
import java.util.Collection;
/**
* SQL 工具类
* @author wjh
* 2024/11/2
*/
public class SqlUtils {
/**
* TODO 批量更新SQL 拼接 暂时还没想好怎么做
* @param collection
* @param primaryKey
* @param columnName
* @return
*/
public static String updateColumn(Collection<?> collection, String primaryKey, String columnName) {
StringBuilder sb = new StringBuilder();
sb.append(columnName).append(" = case ").append(primaryKey);
for (Object item : collection) {
sb.append(" when ");
}
return sb.toString();
}
}

33
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/collection/CollectionUtils.java
View File

@ -168,4 +168,37 @@ public class CollectionUtils extends org.springframework.util.CollectionUtils {
}
return result;
}
/**
* 将新旧列表转换为差异列表
* @param newList 新列表
* @param oldList 旧列表
* @param primaryKeyFunc 唯一标识获取方法
*/
public static<N extends B, O extends B, B> DiffListVO<N, O> convertToDiffList(List<N> newList, List<O> oldList, Function<B, Object> primaryKeyFunc) {
DiffListVO<N, O> result = new DiffListVO<>();
// 全新增
if (CollectionUtils.isEmptyElement(oldList)) {
return result.setAdd(newList);
}
// 全删除
if (CollectionUtils.isEmptyElement(newList)) {
return result.setDel(oldList);
}
Set<Object> newKeys = newList.stream().map(primaryKeyFunc).collect(Collectors.toSet());
Set<Object> oldKeys = oldList.stream().map(primaryKeyFunc).collect(Collectors.toSet());
// 不在旧列表则为新增
List<N> addList = newList.stream().filter(item -> !oldKeys.contains(primaryKeyFunc.apply(item))).filter(Objects::nonNull).collect(Collectors.toList());
result.setAdd(addList);
// 不在新列表则为删除
List<O> delList = oldList.stream().filter(item -> !newKeys.contains(primaryKeyFunc.apply(item))).filter(Objects::nonNull).collect(Collectors.toList());
result.setDel(delList);
// 在新列表，又在旧列表，则为更新
List<N> updateList = newList.stream().filter(item -> oldKeys.contains(primaryKeyFunc.apply(item))).filter(Objects::nonNull).collect(Collectors.toList());
result.setUpdate(updateList);
return result;
}
}

39
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/collection/DiffListVO.java Normal file
View File

@ -0,0 +1,39 @@
package com.ruoyi.common.utils.collection;
import lombok.Data;
import java.util.List;
/**
* 新旧差异列表
* @author wjh
* 2024/11/2
*/
@Data
public class DiffListVO<N, O> {
List<N> addList;
List<N> updateList;
List<O> delList;
public DiffListVO<N,O> setAdd(List<N> list) {
this.addList = list;
return this;
}
public DiffListVO<N,O> setUpdate(List<N> list) {
this.updateList = list;
return this;
}
public DiffListVO<N,O> setDel(List<O> list) {
this.delList = list;
return this;
}
public int getAddCount() {
return CollectionUtils.isEmptyElement(addList) ? 0 : addList.size();
}
public int getUpdateCount() {
return CollectionUtils.isEmptyElement(updateList) ? 0 : updateList.size();
}
public int getDelCount() {
return CollectionUtils.isEmptyElement(delList) ? 0 : delList.size();
}
}

13
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/controller/ReportController.java
View File

@ -4,6 +4,7 @@ import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.validate.ValidGroup;
import com.ruoyi.web.yh.report.domain.bo.ReportBO;
import com.ruoyi.web.yh.report.service.ReportAssembler;
import com.ruoyi.web.yh.report.service.ReportConverter;
@ -51,7 +52,7 @@ public class ReportController extends BaseController
/**
* 查询报表列表
*/
@PreAuthorize("@ss.hasPermi('yh:report:list')")
@PreAuthorize("@ss.hasAnyPermi({'yh:report:list', 'yh:report:groupList'})")
@GetMapping("/list")
public TableDataInfo list(ReportQuery query)
{
@ -83,7 +84,7 @@ public class ReportController extends BaseController
{
ReportVO report = reportService.selectReportByReportId(reportId);
List<ReportVO> list = Collections.singletonList(report);
reportAssembler.assembleProductList(list); // 拼接产量明细
reportAssembler.assembleProductList(list, true); // 拼接产量明细
return success(report);
}
@ -93,7 +94,7 @@ public class ReportController extends BaseController
@PreAuthorize("@ss.hasPermi('yh:report:add')")
@Log(title = "新增车间报表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody @Validated ReportVO data)
public AjaxResult add(@RequestBody @Validated(ValidGroup.Create.class) ReportVO data)
{
ReportBO bo = reportConverter.toBoByCreate(data);
return toAjax(reportService.addReport(bo));
@ -105,9 +106,9 @@ public class ReportController extends BaseController
@PreAuthorize("@ss.hasPermi('yh:report:edit')")
@Log(title = "修改车间报表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Report report)
{
return toAjax(reportService.updateReport(report));
public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) ReportVO data) {
ReportBO bo = reportConverter.toBoByUpdate(data);
return toAjax(reportService.editReport(bo));
}
/**

2
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/Report.java
View File

@ -60,9 +60,11 @@ public class Report extends BaseEntity
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报表日期", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("报表日期")
@NotNull(message = "报表日期不能为空")
private LocalDate reportDate;
@Excel(name = "总金额", readConverterExp = "元=")
@ApiModelProperty("总金额")
@NotNull(message = "总金额不能为空")
private BigDecimal totalAmount;
}

2
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportVO.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -19,5 +20,6 @@ public class ReportVO extends Report {
private String deptName;
@ApiModelProperty("产量明细")
@Size(min = 1, message = "至少填写一个产量明细")
List<ReportProdVO> productList;
}

4
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/ReportAssembler.java
View File

@ -12,7 +12,9 @@ public interface ReportAssembler {
/**
* 拼接产量数据
* @param list 待拼接列表
* @param assembleUserProd 是否拼接员工产量
*/
void assembleProductList(List<ReportVO> list);
void assembleProductList(List<ReportVO> list, boolean assembleUserProd);
}

5
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/ReportConverter.java
View File

@ -16,5 +16,8 @@ public interface ReportConverter {
*/
ReportBO toBoByCreate(ReportVO vo);
/**
* 更新时，VO 转 BO
*/
ReportBO toBoByUpdate(ReportVO vo);
}

6
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/ReportService.java
View File

@ -67,4 +67,10 @@ public interface ReportService
*/
int addReport(ReportBO bo);
/**
* 修改报表
* @param bo
* @return
*/
int editReport(ReportBO bo);
}

18
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportAssemblerImpl.java
View File

@ -7,6 +7,7 @@ import com.ruoyi.web.yh.report.service.ReportService;
import com.ruoyi.web.yh.reportProd.domain.ReportProdQuery;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import com.ruoyi.web.yh.reportProd.service.ReportProdService;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdAssembler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -28,15 +29,26 @@ public class ReportAssemblerImpl implements ReportAssembler {
@Autowired
private ReportProdService reportProdService;
@Autowired
private ReportUserProdAssembler reportUserProdAssembler;
@Override
public void assembleProductList(List<ReportVO> list) {
public void assembleProductList(List<ReportVO> list, boolean assembleUserProd) {
if (CollectionUtils.isEmptyElement(list)) {
return;
}
// 查询产量明细
ReportProdQuery query = new ReportProdQuery();
query.setReportIds(CollectionUtils.map(list, ReportVO::getReportId));
Map<Long, List<ReportProdVO>> group = reportProdService.selectReportProdList(query)
.stream().collect(Collectors.groupingBy(ReportProdVO::getReportId));
List<ReportProdVO> prodList = reportProdService.selectReportProdList(query);
// 拼接员工产量
if (assembleUserProd) {
reportUserProdAssembler.assembleUserProd(prodList);
}
// 分组
Map<Long, List<ReportProdVO>> group = prodList.stream().collect(Collectors.groupingBy(ReportProdVO::getReportId));
for (ReportVO report : list) {
List<ReportProdVO> productList = group.get(report.getReportId());

69
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportConverterImpl.java
View File

@ -12,6 +12,8 @@ import com.ruoyi.web.yh.report.domain.enums.ReportStatus;
import com.ruoyi.web.yh.report.service.ReportConverter;
import com.ruoyi.web.yh.reportProd.domain.ReportProd;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import com.ruoyi.web.yh.reportProd.domain.bo.ReportProdBO;
import com.ruoyi.web.yh.reportProd.service.ReportProdConverter;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -32,6 +34,9 @@ public class ReportConverterImpl implements ReportConverter {
@Autowired
private PriceService priceService;
@Autowired
private ReportProdConverter reportProdConverter;
@Override
public ReportBO toBoByCreate(ReportVO vo) {
if (vo == null) {
@ -41,38 +46,56 @@ public class ReportConverterImpl implements ReportConverter {
LoginUser loginUser = SecurityUtils.getLoginUser();
// 报表主表数据
Report report = new Report();
report.setDeptId(vo.getDeptId());
report.setStatus(ReportStatus.WAIT_VERIFY.getStatus());
report.setCreateId(loginUser.getUserId());
report.setReportDate(vo.getReportDate());
report.setTotalAmount(vo.getTotalAmount());
report.setCreateBy(loginUser.getNickName());
ReportBO bo = new ReportBO();
bo.setDeptId(vo.getDeptId());
bo.setStatus(ReportStatus.WAIT_VERIFY.getStatus());
bo.setCreateId(loginUser.getUserId());
bo.setReportDate(vo.getReportDate());
bo.setTotalAmount(vo.getTotalAmount());
bo.setCreateBy(loginUser.getNickName());
// 报表产量数据
List<ReportProd> productList = new ArrayList<>();
List<ReportProdBO> productList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(vo.getProductList())) {
for (ReportProdVO item : vo.getProductList()) {
ReportProd prod = new ReportProd();
prod.setPriceId(item.getPriceId());
prod.setNum(item.getNum());
prod.setPriceCategory(item.getPriceCategory());
prod.setPriceSize(item.getPriceSize());
prod.setPriceName(item.getPriceName());
prod.setPriceSubName(item.getPriceSubName());
prod.setPricePattern(item.getPricePattern());
prod.setPriceSpec(item.getPriceSpec());
prod.setPricePrice(item.getPricePrice());
prod.setPriceUnit(item.getPriceUnit());
prod.setPriceClassify(item.getPriceClassify());
prod.setPriceQuantity(item.getPriceQuantity());
productList.add(prod);
ReportProdBO prodBo = reportProdConverter.toBoByCreate(item);
productList.add(prodBo);
}
}
// 组装数据
bo.setProductList(productList);
return bo;
}
@Override
public ReportBO toBoByUpdate(ReportVO vo) {
if (vo == null) {
return null;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
// 报表主表数据
ReportBO bo = new ReportBO();
bo.setReport(report);
bo.setReportId(vo.getReportId());
bo.setDeptId(vo.getDeptId());
bo.setReportDate(vo.getReportDate());
bo.setTotalAmount(vo.getTotalAmount());
bo.setStatus(ReportStatus.WAIT_VERIFY.getStatus());
bo.setUpdateId(loginUser.getUserId());
bo.setUpdateBy(loginUser.getNickName());
// 报表产量数据
List<ReportProdBO> productList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(vo.getProductList())) {
for (ReportProdVO item : vo.getProductList()) {
ReportProdBO prodBo = reportProdConverter.toBoByUpdate(item);
productList.add(prodBo);
}
}
// 组装数据
bo.setProductList(productList);
return bo;
}

136
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportServiceImpl.java
View File

@ -1,10 +1,22 @@
package com.ruoyi.web.yh.report.service.impl;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.collection.DiffListVO;
import com.ruoyi.web.yh.report.domain.bo.ReportBO;
import com.ruoyi.web.yh.reportProd.domain.ReportProd;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import com.ruoyi.web.yh.reportProd.domain.bo.ReportProdBO;
import com.ruoyi.web.yh.reportProd.service.ReportProdService;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProd;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.bo.ReportUserProdBO;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.web.yh.report.mapper.ReportMapper;
@ -32,6 +44,9 @@ public class ReportServiceImpl implements ReportService
@Autowired
private ReportProdService reportProdService;
@Autowired
private ReportUserProdService reportUserProdService;
/**
* 查询报表
*
@ -109,19 +124,132 @@ public class ReportServiceImpl implements ReportService
@Override
public int addReport(ReportBO bo) {
ServiceUtil.assertion(bo == null, "参数错误");
// TODO 校验
Integer result = transactionTemplate.execute(status -> {
// todo 新增主表
// 新增主表
int insert = this.insertReport(bo);
ServiceUtil.assertion(insert != 1, "新增报表失败");
// TODO 新增子表
int batchInsert = reportProdService.batchInsertByReportId(bo.getProductList(), bo.getReportId());
ServiceUtil.assertion(batchInsert != bo.getProductList().size(), "新增报表产量明细失败");
// 更新产量表
this.batchUpdateProductList(bo);
// 更新员工产量表
this.batchUpdateUserProductList(bo);
return insert;
});
return result == null ? 0 : result;
}
/**
* 更新员工产量表
* @param bo
* @return
*/
private int batchUpdateUserProductList(ReportBO bo) {
if (bo == null || bo.getReportId() == null || CollectionUtils.isEmptyElement(bo.getProductList())) {
return 0;
}
// 设置总产量ID
for (ReportProdBO prod : bo.getProductList()) {
if (prod.getUserProdList() == null) {
continue;
}
for (ReportUserProdBO userProd : prod.getUserProdList()) {
userProd.setProdId(prod.getId());
}
}
// 扁平化，获取列表
List<ReportUserProdBO> newList = bo.getProductList().stream()
.map(ReportProdBO::getUserProdList)
.flatMap(List::stream)
.filter(Objects::nonNull)
.collect(Collectors.toList());
// 查询旧列表
List<ReportUserProdVO> oldList = reportUserProdService.selectListByReportId(bo.getReportId());
// 获取差异
DiffListVO<ReportUserProdBO, ReportUserProdVO> diff = CollectionUtils.convertToDiffList(newList, oldList, ReportUserProd::getId);
int result = 0;
if (diff.getAddCount() > 0) {
int insert = reportUserProdService.batchInsert(diff.getAddList());
ServiceUtil.assertion(insert != diff.getAddCount(), "新增用户产量明细失败");
result += insert;
}
if (diff.getUpdateCount() > 0) {
int update = reportUserProdService.batchUpdate(diff.getUpdateList());
ServiceUtil.assertion(update != diff.getUpdateCount(), "修改用户产量明细失败");
result += update;
}
if (diff.getDelCount() > 0) {
int del = reportUserProdService.batchLogicDel(diff.getDelList());
ServiceUtil.assertion(del != diff.getDelCount(), "删除用户产量明细失败");
result += del;
}
return result;
}
@Override
public int editReport(ReportBO bo) {
ServiceUtil.assertion(bo == null, "参数错误");
Integer result = transactionTemplate.execute(status -> {
// 修改主表
int update = this.updateReport(bo);
ServiceUtil.assertion(update != 1, "修改报表失败");
// 修改产量表
this.batchUpdateProductList(bo);
// 修改员工产量表
this.batchUpdateUserProductList(bo);
return update;
});
return result == null ? 0 : result;
}
/**
* 更新产量表
*/
private int batchUpdateProductList(ReportBO bo) {
if (bo == null || CollectionUtils.isEmptyElement(bo.getProductList())) {
return 0;
}
// 修改报表ID
for (ReportProd prod : bo.getProductList()) {
prod.setReportId(bo.getReportId());
}
List<ReportProdVO> oldList = reportProdService.selectByReportId(bo.getReportId());
// 分离出新增、修改、删除的列表
DiffListVO<ReportProdBO, ReportProdVO> diff = CollectionUtils.convertToDiffList(bo.getProductList(), oldList, ReportProd::getId);
int result = 0;
if (diff.getAddCount() > 0) {
int batchInsert = reportProdService.batchInsert(diff.getAddList());
ServiceUtil.assertion(batchInsert != diff.getAddCount(), "新增报表产量明细失败");
result += batchInsert;
}
if (diff.getUpdateCount() > 0) {
int update = reportProdService.batchUpdate(diff.getUpdateList());
ServiceUtil.assertion(update != diff.getUpdateCount(), "修改报表产量明细失败");
result += update;
}
if (diff.getDelCount() > 0) {
int del = reportProdService.batchLogicDel(diff.getDelList());
ServiceUtil.assertion(del != diff.getDelCount(), "删除报表产量明细失败");
result += del;
}
return result;
}
}

7
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/domain/ReportProdVO.java
View File

@ -1,11 +1,18 @@
package com.ruoyi.web.yh.reportProd.domain;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author wjh
* 2024/10/31
*/
@Data
public class ReportProdVO extends ReportProd {
@ApiModelProperty("员工产量列表")
private List<ReportUserProdVO> userProdList;
}

9
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/domain/bo/ReportProdBO.java
View File

@ -1,10 +1,19 @@
package com.ruoyi.web.yh.reportProd.domain.bo;
import com.ruoyi.web.yh.reportProd.domain.ReportProd;
import com.ruoyi.web.yh.reportUserProd.domain.bo.ReportUserProdBO;
import lombok.Data;
import java.util.List;
/**
* @author wjh
* 2024/10/31
*/
@Data
public class ReportProdBO extends ReportProd {
// 员工产量列表
private List<ReportUserProdBO> userProdList;
}

10
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/mapper/ReportProdMapper.java
View File

@ -66,4 +66,14 @@ public interface ReportProdMapper
* 批量新增
*/
int batchInsert(@Param("list") List<? extends ReportProd> productList);
/**
* 批量更新
*/
int batchUpdate(@Param("list") List<? extends ReportProd> list);
/**
* 批量逻辑删除
*/
int batchLogicDel(@Param("ids") List<Long> ids);
}

158
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/mapper/ReportProdMapper.xml
View File

@ -21,7 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
brp.price_price,
brp.price_unit,
brp.price_classify,
brp.price_quantity
brp.price_quantity,
brp.deleted
from bst_report_prod brp
</sql>
@ -36,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.priceSpec != null and query.priceSpec != ''"> and brp.price_spec like concat('%', #{query.priceSpec}, '%')</if>
<if test="query.priceUnit != null and query.priceUnit != ''"> and brp.price_unit = #{query.priceUnit}</if>
<if test="query.priceClassify != null and query.priceClassify != ''"> and brp.price_classify like concat('%', #{query.priceClassify}, '%')</if>
<if test="query.deleted == null">and brp.deleted = false</if>
<if test="query.deleted != null">and brp.deleted = #{deleted}</if>
<if test="query.reportIds != null and query.reportIds.size() > 0">
and brp.report_id in
<foreach collection="query.reportIds" item="item" open="(" close=")" separator=",">
@ -54,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReportProdById" parameterType="Long" resultMap="ReportProdResult">
<include refid="selectReportProdVo"/>
where brp.id = #{id}
where brp.id = #{id} and brp.deleted = false
</select>
<insert id="insertReportProd" parameterType="ReportProdBO" keyProperty="id" useGeneratedKeys="true">
@ -91,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<insert id="batchInsert">
<insert id="batchInsert" useGeneratedKeys="true" keyProperty="id">
insert into bst_report_prod(
report_id,
price_id,
@ -164,6 +167,155 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.priceQuantity != null">price_quantity = #{data.priceQuantity},</if>
</sql>
<update id="batchUpdate">
update bst_report_prod
<trim prefix="SET" suffixOverrides=",">
<foreach open="report_id = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.reportId != null">
WHEN #{item.id} THEN #{item.reportId}
</when>
<otherwise>
WHEN #{item.id} THEN `report_id`
</otherwise>
</choose>
</foreach>
<foreach open="price_id = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceId != null">
WHEN #{item.id} THEN #{item.priceId}
</when>
<otherwise>
WHEN #{item.id} THEN `price_id`
</otherwise>
</choose>
</foreach>
<foreach open="num = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.num != null">
WHEN #{item.id} THEN #{item.num}
</when>
<otherwise>
WHEN #{item.id} THEN `num`
</otherwise>
</choose>
</foreach>
<foreach open="price_category = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceCategory != null">
WHEN #{item.id} THEN #{item.priceCategory}
</when>
<otherwise>
WHEN #{item.id} THEN `price_category`
</otherwise>
</choose>
</foreach>
<foreach open="price_size = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceSize != null">
WHEN #{item.id} THEN #{item.priceSize}
</when>
<otherwise>
WHEN #{item.id} THEN `price_size`
</otherwise>
</choose>
</foreach>
<foreach open="price_name = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceName != null">
WHEN #{item.id} THEN #{item.priceName}
</when>
<otherwise>
WHEN #{item.id} THEN `price_name`
</otherwise>
</choose>
</foreach>
<foreach open="price_sub_name = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceSubName != null">
WHEN #{item.id} THEN #{item.priceSubName}
</when>
<otherwise>
WHEN #{item.id} THEN `price_sub_name`
</otherwise>
</choose>
</foreach>
<foreach open="price_pattern = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.pricePattern != null">
WHEN #{item.id} THEN #{item.pricePattern}
</when>
<otherwise>
WHEN #{item.id} THEN `price_pattern`
</otherwise>
</choose>
</foreach>
<foreach open="price_spec = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceSpec != null">
WHEN #{item.id} THEN #{item.priceSpec}
</when>
<otherwise>
WHEN #{item.id} THEN `price_spec`
</otherwise>
</choose>
</foreach>
<foreach open="price_price = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.pricePrice != null">
WHEN #{item.id} THEN #{item.pricePrice}
</when>
<otherwise>
WHEN #{item.id} THEN `price_price`
</otherwise>
</choose>
</foreach>
<foreach open="price_unit = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceUnit != null">
WHEN #{item.id} THEN #{item.priceUnit}
</when>
<otherwise>
WHEN #{item.id} THEN `price_unit`
</otherwise>
</choose>
</foreach>
<foreach open="price_classify = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceClassify != null">
WHEN #{item.id} THEN #{item.priceClassify}
</when>
<otherwise>
WHEN #{item.id} THEN `price_classify`
</otherwise>
</choose>
</foreach>
<foreach open="price_quantity = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceQuantity != null">
WHEN #{item.id} THEN #{item.priceQuantity}
</when>
<otherwise>
WHEN #{item.id} THEN `price_quantity`
</otherwise>
</choose>
</foreach>
</trim>
where id in
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<update id="batchLogicDel">
update bst_report_prod
set deleted = true
where id in
<foreach item="id" collection="ids" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<delete id="deleteReportProdById" parameterType="Long">
delete from bst_report_prod where id = #{id}
</delete>

25
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/service/ReportProdConverter.java Normal file
View File

@ -0,0 +1,25 @@
package com.ruoyi.web.yh.reportProd.service;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import com.ruoyi.web.yh.reportProd.domain.bo.ReportProdBO;
/**
* @author wjh
* 2024/11/2
*/
public interface ReportProdConverter {
/**
* 新增时，VO转为BO
* @param vo
* @return
*/
ReportProdBO toBoByCreate(ReportProdVO vo);
/**
* 更新时，VO 转 BO
* @param vo
* @return
*/
ReportProdBO toBoByUpdate(ReportProdVO vo);
}

22
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/service/ReportProdService.java
View File

@ -64,7 +64,25 @@ public interface ReportProdService
/**
* 根据报表ID，批量新增产量
* @param productList 产量列表
* @param reportId 报表ID
*/
int batchInsertByReportId(List<? extends ReportProd> productList, Long reportId);
int batchInsert(List<? extends ReportProd> productList);
/**
* 根据报表ID，批量修改产量
*
* @param list 产量列表
*/
int batchUpdate(List<? extends ReportProd> list);
/**
* 根据报表ID查询列表
* @param reportId 报表ID
* @return
*/
List<ReportProdVO> selectByReportId(Long reportId);
/**
* 批量逻辑删除
*/
int batchLogicDel(List<ReportProdVO> list);
}

93
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/service/impl/ReportProdConverterImpl.java Normal file
View File

@ -0,0 +1,93 @@
package com.ruoyi.web.yh.reportProd.service.impl;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import com.ruoyi.web.yh.reportProd.domain.bo.ReportProdBO;
import com.ruoyi.web.yh.reportProd.service.ReportProdConverter;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.bo.ReportUserProdBO;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdConverter;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @author wjh
* 2024/11/2
*/
@Service
public class ReportProdConverterImpl implements ReportProdConverter {
@Autowired
private ReportUserProdConverter reportUserProdConverter;
@Override
public ReportProdBO toBoByCreate(ReportProdVO vo) {
if (vo == null) {
return null;
}
ReportProdBO bo = new ReportProdBO();
bo.setPriceId(vo.getPriceId());
bo.setNum(vo.getNum());
bo.setPriceCategory(vo.getPriceCategory());
bo.setPriceSize(vo.getPriceSize());
bo.setPriceName(vo.getPriceName());
bo.setPriceSubName(vo.getPriceSubName());
bo.setPricePattern(vo.getPricePattern());
bo.setPriceSpec(vo.getPriceSpec());
bo.setPricePrice(vo.getPricePrice());
bo.setPriceUnit(vo.getPriceUnit());
bo.setPriceClassify(vo.getPriceClassify());
bo.setPriceQuantity(vo.getPriceQuantity());
// 用户产量明细
List<ReportUserProdBO> userProdList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(vo.getUserProdList())) {
for (ReportUserProdVO item : vo.getUserProdList()) {
ReportUserProdBO userProd = reportUserProdConverter.toBoByCreate(item);
userProdList.add(userProd);
}
}
bo.setUserProdList(userProdList);
return bo;
}
@Override
public ReportProdBO toBoByUpdate(ReportProdVO vo) {
if (vo == null) {
return null;
}
ReportProdBO bo = new ReportProdBO();
bo.setId(vo.getId());
bo.setReportId(vo.getReportId());
bo.setPriceId(vo.getPriceId());
bo.setNum(vo.getNum());
bo.setPriceCategory(vo.getPriceCategory());
bo.setPriceSize(vo.getPriceSize());
bo.setPriceName(vo.getPriceName());
bo.setPriceSubName(vo.getPriceSubName());
bo.setPricePattern(vo.getPricePattern());
bo.setPriceSpec(vo.getPriceSpec());
bo.setPricePrice(vo.getPricePrice());
bo.setPriceUnit(vo.getPriceUnit());
bo.setPriceClassify(vo.getPriceClassify());
bo.setPriceQuantity(vo.getPriceQuantity());
// 用户产量明细
List<ReportUserProdBO> userProdList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(vo.getUserProdList())) {
for (ReportUserProdVO item : vo.getUserProdList()) {
ReportUserProdBO userProd = reportUserProdConverter.toBoByUpdate(item);
userProdList.add(userProd);
}
}
bo.setUserProdList(userProdList);
return bo;
}
}

49
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/service/impl/ReportProdServiceImpl.java
View File

@ -1,8 +1,15 @@
package com.ruoyi.web.yh.reportProd.service.impl;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.web.yh.reportProd.domain.bo.ReportProdBO;
import com.ruoyi.web.yh.reportUserProd.domain.bo.ReportUserProdBO;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.web.yh.reportProd.mapper.ReportProdMapper;
@ -10,6 +17,7 @@ import com.ruoyi.web.yh.reportProd.domain.ReportProd;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import com.ruoyi.web.yh.reportProd.domain.ReportProdQuery;
import com.ruoyi.web.yh.reportProd.service.ReportProdService;
import org.springframework.transaction.support.TransactionTemplate;
/**
* 报表产量Service业务层处理
@ -23,6 +31,12 @@ public class ReportProdServiceImpl implements ReportProdService
@Autowired
private ReportProdMapper reportProdMapper;
@Autowired
private TransactionTemplate transactionTemplate;
@Autowired
private ReportUserProdService reportUserProdService;
/**
* 查询报表产量
*
@ -96,14 +110,37 @@ public class ReportProdServiceImpl implements ReportProdService
}
@Override
public int batchInsertByReportId(List<? extends ReportProd> productList, Long reportId) {
if (CollectionUtils.isEmptyElement(productList) || reportId == null) {
public int batchInsert(List<? extends ReportProd> productList) {
if (CollectionUtils.isEmptyElement(productList) ) {
return 0;
}
// TODO 校验
for (ReportProd prod : productList) {
prod.setReportId(reportId);
}
return reportProdMapper.batchInsert(productList);
}
@Override
public int batchUpdate(List<? extends ReportProd> list) {
if (CollectionUtils.isEmptyElement(list)) {
return 0;
}
return reportProdMapper.batchUpdate(list);
}
@Override
public List<ReportProdVO> selectByReportId(Long reportId) {
if (reportId == null) {
return Collections.emptyList();
}
ReportProdQuery query = new ReportProdQuery();
query.setReportId(reportId);
return reportProdMapper.selectReportProdList(query);
}
@Override
public int batchLogicDel(List<ReportProdVO> list) {
if (CollectionUtils.isEmptyElement(list)) {
return 0;
}
List<Long> ids = list.stream().map(ReportProdVO::getId).filter(Objects::nonNull).collect(Collectors.toList());
return reportProdMapper.batchLogicDel(ids);
}
}

103
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/controller/ReportUserProdController.java Normal file
View File

@ -0,0 +1,103 @@
package com.ruoyi.web.yh.reportUserProd.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdQuery;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 员工产量Controller
*
* @author ruoyi
* @date 2024-11-02
*/
@RestController
@RequestMapping("/yh/reportUserProd")
public class ReportUserProdController extends BaseController
{
@Autowired
private ReportUserProdService reportUserProdService;
/**
* 查询员工产量列表
*/
@PreAuthorize("@ss.hasPermi('yh:reportUserProd:list')")
@GetMapping("/list")
public TableDataInfo list(ReportUserProdQuery query)
{
startPage();
startOrderBy();
List<ReportUserProdVO> list = reportUserProdService.selectReportUserProdList(query);
return getDataTable(list);
}
/**
* 导出员工产量列表
*/
@PreAuthorize("@ss.hasPermi('yh:reportUserProd:export')")
@Log(title = "导出员工产量", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ReportUserProdQuery query)
{
List<ReportUserProdVO> list = reportUserProdService.selectReportUserProdList(query);
ExcelUtil<ReportUserProdVO> util = new ExcelUtil<ReportUserProdVO>(ReportUserProdVO.class);
util.exportExcel(response, list, "员工产量数据");
}
/**
* 获取员工产量详细信息
*/
@PreAuthorize("@ss.hasPermi('yh:reportUserProd:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(reportUserProdService.selectReportUserProdById(id));
}
/**
* 新增员工产量
*/
// @PreAuthorize("@ss.hasPermi('yh:reportUserProd:add')")
// @Log(title = "新增员工产量", businessType = BusinessType.INSERT)
// @PostMapping
// public AjaxResult add(@RequestBody ReportUserProd reportUserProd)
// {
// return toAjax(reportUserProdService.insertReportUserProd(reportUserProd));
// }
//
// /**
// * 修改员工产量
// */
// @PreAuthorize("@ss.hasPermi('yh:reportUserProd:edit')")
// @Log(title = "修改员工产量", businessType = BusinessType.UPDATE)
// @PutMapping
// public AjaxResult edit(@RequestBody ReportUserProd reportUserProd)
// {
// return toAjax(reportUserProdService.updateReportUserProd(reportUserProd));
// }
//
// /**
// * 删除员工产量
// */
// @PreAuthorize("@ss.hasPermi('yh:reportUserProd:remove')")
// @Log(title = "删除员工产量", businessType = BusinessType.DELETE)
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable Long[] ids)
// {
// return toAjax(reportUserProdService.deleteReportUserProdByIds(ids));
// }
}

36
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/domain/ReportUserProd.java Normal file
View File

@ -0,0 +1,36 @@
package com.ruoyi.web.yh.reportUserProd.domain;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 员工产量对象 bst_report_user_prod
*
* @author ruoyi
* @date 2024-11-02
*/
@Data
public class ReportUserProd extends BaseEntity
{
private static final long serialVersionUID = 1L;
private Long id;
@Excel(name = "总产量ID")
@ApiModelProperty("总产量ID")
private Long prodId;
@Excel(name = "员工ID")
@ApiModelProperty("员工ID")
private Long userId;
@Excel(name = "产量")
@ApiModelProperty("产量")
private BigDecimal num;
}

18
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/domain/ReportUserProdQuery.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.web.yh.reportUserProd.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author wjh
* 2024/11/2
*/
@Data
public class ReportUserProdQuery extends ReportUserProdVO {
@ApiModelProperty("产量ID列表")
private List<Long> prodIds;
}

36
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/domain/ReportUserProdVO.java Normal file
View File

@ -0,0 +1,36 @@
package com.ruoyi.web.yh.reportUserProd.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* @author wjh
* 2024/11/2
*/
@Data
public class ReportUserProdVO extends ReportUserProd {
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("报表日期")
private LocalDate reportDate;
@ApiModelProperty("报表状态")
private String reportStatus;
@ApiModelProperty("工序名称")
private String priceName;
@ApiModelProperty("工序单位")
private String priceUnit;
@ApiModelProperty("工序单价")
private BigDecimal pricePrice;
@ApiModelProperty("报表ID")
private Long reportId;
}

12
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/domain/bo/ReportUserProdBO.java Normal file
View File

@ -0,0 +1,12 @@
package com.ruoyi.web.yh.reportUserProd.domain.bo;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProd;
import lombok.Data;
/**
* @author wjh
* 2024/11/2
*/
@Data
public class ReportUserProdBO extends ReportUserProd {
}

80
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/mapper/ReportUserProdMapper.java Normal file
View File

@ -0,0 +1,80 @@
package com.ruoyi.web.yh.reportUserProd.mapper;
import java.util.List;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProd;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdQuery;
import com.ruoyi.web.yh.reportUserProd.domain.bo.ReportUserProdBO;
import org.apache.ibatis.annotations.Param;
/**
* 员工产量Mapper接口
*
* @author ruoyi
* @date 2024-11-02
*/
public interface ReportUserProdMapper
{
/**
* 查询员工产量
*
* @param id 员工产量主键
* @return 员工产量
*/
public ReportUserProdVO selectReportUserProdById(Long id);
/**
* 查询员工产量列表
*
* @param query 员工产量
* @return 员工产量集合
*/
public List<ReportUserProdVO> selectReportUserProdList(@Param("query")ReportUserProdQuery query);
/**
* 新增员工产量
*
* @param reportUserProd 员工产量
* @return 结果
*/
public int insertReportUserProd(ReportUserProd reportUserProd);
/**
* 修改员工产量
*
* @param reportUserProd 员工产量
* @return 结果
*/
public int updateReportUserProd(@Param("data") ReportUserProd reportUserProd);
/**
* 删除员工产量
*
* @param id 员工产量主键
* @return 结果
*/
public int deleteReportUserProdById(Long id);
/**
* 批量删除员工产量
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteReportUserProdByIds(Long[] ids);
/**
* 批量新增
*/
int batchInsert(@Param("list") List<? extends ReportUserProd> list);
/**
* 批量更新
*/
int batchUpdate(@Param("list") List<? extends ReportUserProd> list);
/**
* 批量逻辑删除
*/
int batchLogicDel(@Param("ids") List<Long> ids);
}

182
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/mapper/ReportUserProdMapper.xml Normal file
View File

@ -0,0 +1,182 @@
<?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="com.ruoyi.web.yh.reportUserProd.mapper.ReportUserProdMapper">
<resultMap type="ReportUserProdVO" id="ReportUserProdResult" autoMapping="true"/>
<sql id="selectReportUserProdVo">
select
brup.id,
brup.prod_id,
brup.user_id,
brup.num,
brup.deleted,
su.nick_name as user_name,
brp.price_name as price_name,
brp.price_unit as price_unit,
brp.price_price as price_price,
brp.report_id as report_id,
br.report_date as report_date,
br.status as report_status
from bst_report_user_prod brup
left join sys_user su on su.user_id = brup.user_id
left join bst_report_prod brp on brp.id = brup.prod_id
left join bst_report br on br.report_id = brp.report_id
left join sys_dept sd on sd.dept_id = br.dept_id
</sql>
<sql id="searchCondition">
<if test="query.id != null "> and brup.id = #{query.id}</if>
<if test="query.prodId != null "> and brup.prod_id = #{query.prodId}</if>
<if test="query.userId != null "> and brup.user_id = #{query.userId}</if>
<if test="query.reportId != null "> and brp.report_id = #{query.reportId}</if>
<if test="query.deleted == null "> and brup.deleted = false</if>
<if test="query.deleted != null "> and brup.deleted = #{query.deleted}</if>
<if test="query.prodIds != null and query.prodIds.size() > 0 ">
and brup.prod_id in
<foreach item="item" collection="query.prodIds" open="(" separator="," close=")">
#{item}
</foreach>
</if>
${query.params.dataScope}
</sql>
<select id="selectReportUserProdList" parameterType="ReportUserProdQuery" resultMap="ReportUserProdResult">
<include refid="selectReportUserProdVo"/>
<where>
<include refid="searchCondition"/>
</where>
</select>
<select id="selectReportUserProdById" parameterType="Long" resultMap="ReportUserProdResult">
<include refid="selectReportUserProdVo"/>
where brup.id = #{id} and brp.deleted = false
</select>
<insert id="insertReportUserProd" parameterType="ReportUserProd" useGeneratedKeys="true" keyProperty="id">
insert into bst_report_user_prod
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="prodId != null">prod_id,</if>
<if test="userId != null">user_id,</if>
<if test="num != null">num,</if>
<if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="prodId != null">#{prodId},</if>
<if test="userId != null">#{userId},</if>
<if test="num != null">#{num},</if>
<if test="deleted != null">#{deleted},</if>
</trim>
</insert>
<insert id="batchInsert" useGeneratedKeys="true" keyProperty="id">
insert into bst_report_user_prod (
prod_id,
user_id,
num,
deleted
)
values
<foreach collection="list" item="i" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="i.prodId != null">#{i.prodId},</if>
<if test="i.prodId == null">default,</if>
<if test="i.userId != null">#{i.userId},</if>
<if test="i.userId == null">default,</if>
<if test="i.num != null">#{i.num},</if>
<if test="i.num == null">default,</if>
<if test="i.deleted != null">#{i.deleted},</if>
<if test="i.deleted == null">default,</if>
</trim>
</foreach>
</insert>
<update id="updateReportUserProd" parameterType="ReportUserProd">
update bst_report_user_prod
<trim prefix="SET" suffixOverrides=",">
<include refid="updateColumns"/>
</trim>
where id = #{data.id}
</update>
<sql id="updateColumns">
<if test="data.prodId != null">prod_id = #{data.prodId},</if>
<if test="data.userId != null">user_id = #{data.userId},</if>
<if test="data.num != null">num = #{data.num},</if>
<if test="data.deleted != null">deleted = #{data.deleted},</if>
</sql>
<update id="batchUpdate">
update bst_report_user_prod
<trim prefix="SET" suffixOverrides=",">
<foreach open="prod_id = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.prodId != null">
WHEN #{item.id} THEN #{item.prodId}
</when>
<otherwise>
WHEN #{item.id} THEN `prod_id`
</otherwise>
</choose>
</foreach>
<foreach open="user_id = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.userId != null">
WHEN #{item.id} THEN #{item.userId}
</when>
<otherwise>
WHEN #{item.id} THEN `user_id`
</otherwise>
</choose>
</foreach>
<foreach open="num = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.num != null">
WHEN #{item.id} THEN #{item.num}
</when>
<otherwise>
WHEN #{item.id} THEN `num`
</otherwise>
</choose>
</foreach>
<foreach open="deleted = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.deleted != null">
WHEN #{item.id} THEN #{item.deleted}
</when>
<otherwise>
WHEN #{item.id} THEN `deleted`
</otherwise>
</choose>
</foreach>
</trim>
where id in
<foreach collection="list" open="(" close=")" item="item" separator=",">
#{item.id}
</foreach>
</update>
<update id="batchLogicDel">
update bst_report_user_prod
set deleted = 1
where id in
<foreach collection="ids" open="(" close=")" item="item" separator=",">
#{item}
</foreach>
</update>
<delete id="deleteReportUserProdById" parameterType="Long">
delete from bst_report_user_prod where id = #{id}
</delete>
<delete id="deleteReportUserProdByIds" parameterType="String">
delete from bst_report_user_prod where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

17
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/service/ReportUserProdAssembler.java Normal file
View File

@ -0,0 +1,17 @@
package com.ruoyi.web.yh.reportUserProd.service;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import java.util.List;
/**
* @author wjh
* 2024/11/2
*/
public interface ReportUserProdAssembler {
/**
* 拼接员工产量
*/
void assembleUserProd(List<ReportProdVO> list);
}

23
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/service/ReportUserProdConverter.java Normal file
View File

@ -0,0 +1,23 @@
package com.ruoyi.web.yh.reportUserProd.service;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.bo.ReportUserProdBO;
/**
* @author wjh
* 2024/11/2
*/
public interface ReportUserProdConverter {
/**
* 新增时，vo转bo
* @param vo
* @return
*/
ReportUserProdBO toBoByCreate(ReportUserProdVO vo);
/**
* 更新时，vo转bo
*/
ReportUserProdBO toBoByUpdate(ReportUserProdVO vo);
}

88
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/service/ReportUserProdService.java Normal file
View File

@ -0,0 +1,88 @@
package com.ruoyi.web.yh.reportUserProd.service;
import java.util.List;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProd;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdQuery;
/**
* 员工产量Service接口
*
* @author ruoyi
* @date 2024-11-02
*/
public interface ReportUserProdService
{
/**
* 查询员工产量
*
* @param id 员工产量主键
* @return 员工产量
*/
public ReportUserProdVO selectReportUserProdById(Long id);
/**
* 查询员工产量列表
*
* @param reportUserProd 员工产量
* @return 员工产量集合
*/
public List<ReportUserProdVO> selectReportUserProdList(ReportUserProdQuery reportUserProd);
/**
* 新增员工产量
*
* @param reportUserProd 员工产量
* @return 结果
*/
public int insertReportUserProd(ReportUserProd reportUserProd);
/**
* 修改员工产量
*
* @param reportUserProd 员工产量
* @return 结果
*/
public int updateReportUserProd(ReportUserProd reportUserProd);
/**
* 批量删除员工产量
*
* @param ids 需要删除的员工产量主键集合
* @return 结果
*/
public int deleteReportUserProdByIds(Long[] ids);
/**
* 删除员工产量信息
*
* @param id 员工产量主键
* @return 结果
*/
public int deleteReportUserProdById(Long id);
/**
* 批量新增
* @param list
* @return
*/
int batchInsert(List<? extends ReportUserProd> list);
/**
* 根据报表ID查询列表
*
* @param reportId
* @return
*/
List<ReportUserProdVO> selectListByReportId(Long reportId);
/**
* 批量更新
*/
int batchUpdate(List<? extends ReportUserProd> list);
/**
* 批量删除
*/
int batchLogicDel(List<? extends ReportUserProd> list);
}

48
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/service/impl/ReportUserProdAssemblerImpl.java Normal file
View File

@ -0,0 +1,48 @@
package com.ruoyi.web.yh.reportUserProd.service.impl;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.web.yh.reportProd.domain.ReportProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdQuery;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdAssembler;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author wjh
* 2024/11/2
*/
@Service
public class ReportUserProdAssemblerImpl implements ReportUserProdAssembler {
@Autowired
private ReportUserProdService reportUserProdService;
@Override
public void assembleUserProd(List<ReportProdVO> list) {
if (CollectionUtils.isEmptyElement(list)) {
return;
}
ReportUserProdQuery query = new ReportUserProdQuery();
query.setProdIds(CollectionUtils.map(list, ReportProdVO::getId));
Map<Long, List<ReportUserProdVO>> group = reportUserProdService.selectReportUserProdList(query)
.stream().collect(Collectors.groupingBy(ReportUserProdVO::getProdId));
for (ReportProdVO prod : list) {
List<ReportUserProdVO> userProdList = group.get(prod.getId());
if (userProdList == null) {
prod.setUserProdList(new ArrayList<>());
} else {
prod.setUserProdList(userProdList);
}
}
}
}

46
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/service/impl/ReportUserProdConverterImpl.java Normal file
View File

@ -0,0 +1,46 @@
package com.ruoyi.web.yh.reportUserProd.service.impl;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProd;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.bo.ReportUserProdBO;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdConverter;
import org.springframework.stereotype.Service;
/**
* @author wjh
* 2024/11/2
*/
@Service
public class ReportUserProdConverterImpl implements ReportUserProdConverter {
/**
* 新增时，vo转bo
*
* @param vo
* @return
*/
@Override
public ReportUserProdBO toBoByCreate(ReportUserProdVO vo) {
if (vo == null) {
return null;
}
ReportUserProdBO bo = new ReportUserProdBO();
bo.setUserId(vo.getUserId());
bo.setNum(vo.getNum());
return bo;
}
@Override
public ReportUserProdBO toBoByUpdate(ReportUserProdVO vo) {
if (vo == null) {
return null;
}
ReportUserProdBO bo = new ReportUserProdBO();
bo.setId(vo.getId());
bo.setProdId(vo.getProdId());
bo.setUserId(vo.getUserId());
bo.setNum(vo.getNum());
return bo;
}
}

134
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportUserProd/service/impl/ReportUserProdServiceImpl.java Normal file
View File

@ -0,0 +1,134 @@
package com.ruoyi.web.yh.reportUserProd.service.impl;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.collection.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.web.yh.reportUserProd.mapper.ReportUserProdMapper;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProd;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdVO;
import com.ruoyi.web.yh.reportUserProd.domain.ReportUserProdQuery;
import com.ruoyi.web.yh.reportUserProd.service.ReportUserProdService;
/**
* 员工产量Service业务层处理
*
* @author ruoyi
* @date 2024-11-02
*/
@Service
public class ReportUserProdServiceImpl implements ReportUserProdService
{
@Autowired
private ReportUserProdMapper reportUserProdMapper;
/**
* 查询员工产量
*
* @param id 员工产量主键
* @return 员工产量
*/
@Override
public ReportUserProdVO selectReportUserProdById(Long id)
{
return reportUserProdMapper.selectReportUserProdById(id);
}
/**
* 查询员工产量列表
*
* @param reportUserProd 员工产量
* @return 员工产量
*/
@Override
public List<ReportUserProdVO> selectReportUserProdList(ReportUserProdQuery reportUserProd)
{
return reportUserProdMapper.selectReportUserProdList(reportUserProd);
}
/**
* 新增员工产量
*
* @param reportUserProd 员工产量
* @return 结果
*/
@Override
public int insertReportUserProd(ReportUserProd reportUserProd)
{
return reportUserProdMapper.insertReportUserProd(reportUserProd);
}
/**
* 修改员工产量
*
* @param reportUserProd 员工产量
* @return 结果
*/
@Override
public int updateReportUserProd(ReportUserProd reportUserProd)
{
return reportUserProdMapper.updateReportUserProd(reportUserProd);
}
/**
* 批量删除员工产量
*
* @param ids 需要删除的员工产量主键
* @return 结果
*/
@Override
public int deleteReportUserProdByIds(Long[] ids)
{
return reportUserProdMapper.deleteReportUserProdByIds(ids);
}
/**
* 删除员工产量信息
*
* @param id 员工产量主键
* @return 结果
*/
@Override
public int deleteReportUserProdById(Long id)
{
return reportUserProdMapper.deleteReportUserProdById(id);
}
@Override
public int batchInsert(List<? extends ReportUserProd> list) {
if (CollectionUtils.isEmptyElement(list)) {
return 0;
}
return reportUserProdMapper.batchInsert(list);
}
@Override
public List<ReportUserProdVO> selectListByReportId(Long reportId) {
if (reportId == null) {
return Collections.emptyList();
}
ReportUserProdQuery query = new ReportUserProdQuery();
query.setReportId(reportId);
return reportUserProdMapper.selectReportUserProdList(query);
}
@Override
public int batchUpdate(List<? extends ReportUserProd> list) {
if (CollectionUtils.isEmptyElement(list)) {
return 0;
}
return reportUserProdMapper.batchUpdate(list);
}
@Override
public int batchLogicDel(List<? extends ReportUserProd> list) {
if (CollectionUtils.isEmptyElement(list)) {
return 0;
}
List<Long> ids = list.stream().map(ReportUserProd::getId).collect(Collectors.toList());
return reportUserProdMapper.batchLogicDel(ids);
}
}