月度产值计划、设计完工产值

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java

@@ -25,6 +25,7 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.cailiaoshebei.service.IBusCailiaoshebeiService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -248,4 +249,5 @@ public class BusCailiaoshebeiController extends BaseController {
         return R.ok(busBillofquantitiesVersionsService.obtainTheList(bo));
     }
 
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlan.java

@@ -33,6 +33,11 @@ public class OutMonthPlan extends BaseEntity {
      */
     private Long projectId;
 
+    /**
+     * 类型 1对甲 2对乙
+     */
+    private String type;
+
     /**
      * 计划产值
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutMonthPlanAudit.java

@@ -33,6 +33,16 @@ public class OutMonthPlanAudit extends BaseEntity {
      */
     private Long projectId;
 
+    /**
+     * 类型 1对甲 2对乙
+     */
+    private String type;
+
+    /**
+     * 计划产值
+     */
+    private BigDecimal planValue;
+
     /**
      * 设计产值
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanAuditBo.java

@@ -33,6 +33,18 @@ public class OutMonthPlanAuditBo extends BaseEntity {
     @NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long projectId;
 
+    /**
+     * 类型 1对甲 2对乙
+     */
+    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 计划产值
+     */
+    @NotNull(message = "计划产值不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal planValue;
+
     /**
      * 设计产值
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/bo/OutMonthPlanBo.java

@@ -33,6 +33,12 @@ public class OutMonthPlanBo extends BaseEntity {
     @NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long projectId;
 
+    /**
+     * 类型 1对甲 2对乙
+     */
+    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
     /**
      * 计划产值
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanAuditVo.java

@@ -41,6 +41,13 @@ public class OutMonthPlanAuditVo implements Serializable {
     @ExcelProperty(value = "项目ID")
     private Long projectId;
 
+    /**
+     * 类型 1对甲 2对乙
+     */
+    @ExcelProperty(value = "类型 1对甲 2对乙")
+    private String type;
+
+
     /**
      * 设计产值
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutMonthPlanVo.java

@@ -41,6 +41,12 @@ public class OutMonthPlanVo implements Serializable {
     @ExcelProperty(value = "项目ID")
     private Long projectId;
 
+    /**
+     * 类型 1对甲 2对乙
+     */
+    @ExcelProperty(value = "类型 1对甲 2对乙")
+    private String type;
+
     /**
      * 计划产值
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java

@@ -101,6 +101,7 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<OutMonthPlan> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(OutMonthPlan::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), OutMonthPlan::getType, bo.getType());
         lqw.eq(bo.getProjectId() != null, OutMonthPlan::getProjectId, bo.getProjectId());
         lqw.eq(bo.getPlanValue() != null, OutMonthPlan::getPlanValue, bo.getPlanValue());
         lqw.eq(bo.getCompleteValue() != null, OutMonthPlan::getCompleteValue, bo.getCompleteValue());