lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改进度、产值

Browse Source
This commit is contained in:
lcj
2025-08-30 03:25:03 +08:00
parent 8a29ffdd2e
commit a07792c8e3
4 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java
View File

@ -24,10 +24,15 @@ public class PgsProgressCategoryCreateReq implements Serializable {
@NotNull(message = "父类别id不能为空") @NotNull(message = "父类别id不能为空")
private Long parentId; private Long parentId;
/**
* 子项目id
*/
@NotNull(message = "子项目id不能为空")
private Long projectId;
/** /**
* 方阵id * 方阵id
*/ */
@NotNull(message = "方阵id不能为空")
private Long matrixId; private Long matrixId;
/** /**
@ -63,7 +68,6 @@ public class PgsProgressCategoryCreateReq implements Serializable {
/** /**
* 关联结构(1子项目 2方阵) * 关联结构(1子项目 2方阵)
*/ */
@NotBlank(message = "关联结构不能为空")
private String relevancyStructure; private String relevancyStructure;
/** /**

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progressplandetail/PgsProgressPlanDetailNumVo.java
View File

@ -1,12 +1,11 @@
package org.dromara.progress.domain.vo.progressplandetail; package org.dromara.progress.domain.vo.progressplandetail;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* @author lilemy * @author lilemy
@ -25,8 +24,7 @@ public class PgsProgressPlanDetailNumVo {
/** /**
* 计划时间 * 计划时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") private LocalDate date;
private Date date;
/** /**
* 计划数量/百分比 * 计划数量/百分比

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
View File

@ -271,6 +271,11 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
throw new ServiceException("超过最大层级", HttpStatus.BAD_REQUEST); throw new ServiceException("超过最大层级", HttpStatus.BAD_REQUEST);
} }
progressCategory.setAncestors(ancestors + StringUtils.SEPARATOR + progressCategory.getParentId()); progressCategory.setAncestors(ancestors + StringUtils.SEPARATOR + progressCategory.getParentId());
progressCategory.setRelevancyStructure(parent.getRelevancyStructure());
if (PgsRelevancyStructureEnum.MATRIX.getValue().equals(parent.getRelevancyStructure())) {
progressCategory.setMatrixName(parent.getMatrixName());
progressCategory.setMatrixId(parent.getMatrixId());
}
} }
// 计算产值 // 计算产值
if (ownerPrice != null && total != null && ownerPrice.compareTo(BigDecimal.ZERO) >= 0 && total.compareTo(BigDecimal.ZERO) >= 0) { if (ownerPrice != null && total != null && ownerPrice.compareTo(BigDecimal.ZERO) >= 0 && total.compareTo(BigDecimal.ZERO) >= 0) {

67
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/out/OutMonthPlanMapper.xml
View File

@ -6,40 +6,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="purchaseValueAA" resultType="org.dromara.out.domain.BusProcurement"> <select id="purchaseValueAA" resultType="org.dromara.out.domain.BusProcurement">
<!-- SELECT--> <!-- SELECT-->
<!-- b.name,--> <!-- b.name,-->
<!-- b.specification,--> <!-- b.specification,-->
<!-- b.unit,--> <!-- b.unit,-->
<!-- (SELECT SUM(accepted_quantity) FROM mat_material_receive_item WHERE project_id = #{projectId} and name = b.name and specification = b.specification) as acceptedQuantity,--> <!-- (SELECT SUM(accepted_quantity) FROM mat_material_receive_item WHERE project_id = #{projectId} and name = b.name and specification = b.specification) as acceptedQuantity,-->
<!-- a.unit_price,--> <!-- a.unit_price,-->
<!-- DATE_FORMAT(b.create_time,'%Y-%m') as yf--> <!-- DATE_FORMAT(b.create_time,'%Y-%m') as yf-->
<!-- FROM--> <!-- FROM-->
<!-- bus_bidding_limit_list as a--> <!-- bus_bidding_limit_list as a-->
<!-- RIGHT JOIN mat_material_receive_item as b on b.`name` = a.`name` and b.specification = a.specification--> <!-- RIGHT JOIN mat_material_receive_item as b on b.`name` = a.`name` and b.specification = a.specification-->
<!-- WHERE--> <!-- WHERE-->
<!-- b.project_id = #{projectId}--> <!-- b.project_id = #{projectId}-->
<!-- <if test="planMonth != null and planMonth!=''">--> <!-- <if test="planMonth != null and planMonth!=''">-->
<!-- and DATE_FORMAT(b.create_time,'%Y-%m') = #{planMonth}--> <!-- and DATE_FORMAT(b.create_time,'%Y-%m') = #{planMonth}-->
<!-- </if>--> <!-- </if>-->
<!-- GROUP BY yf,b.name,b.specification--> <!-- GROUP BY yf,b.name,b.specification-->
SELECT SELECT
a.NAME, a.NAME,
a.specification, a.specification,
a.unit, a.unit,
a.unit_price as unitPrice, a.unit_price as unitPrice,
DATE_FORMAT( a.create_time, '%Y-%m' ) AS yf DATE_FORMAT( a.create_time, '%Y-%m' ) AS yf
FROM FROM
bus_bidding_limit_list AS a bus_bidding_limit_list AS a
<where> where
a.project_id = #{projectId} a.project_id = #{projectId}
<if test="planMonth != null and planMonth!='' "> <if test="planMonth != null and planMonth!='' ">
and DATE_FORMAT(b.create_time,'%Y-%m') = #{planMonth} and DATE_FORMAT(a.create_time,'%Y-%m') = #{planMonth}
</if> </if>
</where> GROUP BY
GROUP BY yf,
yf, a.NAME,
a.NAME, a.specification
a.specification
</select> </select>
<select id="purchaseValueBB" resultType="org.dromara.out.domain.BusProcurement"> <select id="purchaseValueBB" resultType="org.dromara.out.domain.BusProcurement">