优化 滚动计划审核

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RollingPlanController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+import java.util.Date;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,4 +101,30 @@ public class RollingPlanController extends BaseController
     {
         return toAjax(rollingPlanService.deleteRollingPlanByPlanIds(planIds));
     }
+
+    /**
+     * 查询待审核的滚动计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:rolling-plan:audit:list')")
+    @GetMapping("/auditList")
+    public TableDataInfo auditList(RollingPlan rollingPlan)
+    {
+        startPage();
+        List<RollingPlan> list = rollingPlanService.selectRollingPlanAuditList(rollingPlan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 审核滚动计划
+     */
+    @PreAuthorize("@ss.hasPermi('system:rolling-plan:audit:operation')")
+    @Log(title = "滚动计划审核", businessType = BusinessType.UPDATE)
+    @PostMapping("/audit")
+    public AjaxResult audit(@RequestBody RollingPlan rollingPlan)
+    {
+        // 设置审核人和审核时间
+        rollingPlan.setAuditBy(getUsername());
+        rollingPlan.setAuditTime(new Date());
+        return toAjax(rollingPlanService.auditRollingPlan(rollingPlan));
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/RollingPlan.java

@@ -251,4 +251,258 @@ public class RollingPlan extends BaseEntity
     {
         this.auditTime = auditTime;
     }
+
+    public String getVersionWeek()
+    {
+        return versionWeek;
+    }
+
+    public void setVersionWeek(String versionWeek)
+    {
+        this.versionWeek = versionWeek;
+    }
+
+    public String getProductionMode()
+    {
+        return productionMode;
+    }
+
+    public void setProductionMode(String productionMode)
+    {
+        this.productionMode = productionMode;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getSalesAreaCode() {
+        return salesAreaCode;
+    }
+
+    public void setSalesAreaCode(String salesAreaCode) {
+        this.salesAreaCode = salesAreaCode;
+    }
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+
+    public String getSalesCoordinator() {
+        return salesCoordinator;
+    }
+
+    public void setSalesCoordinator(String salesCoordinator) {
+        this.salesCoordinator = salesCoordinator;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getProductionVersion() {
+        return productionVersion;
+    }
+
+    public void setProductionVersion(String productionVersion) {
+        this.productionVersion = productionVersion;
+    }
+
+    public String getBrandCode() {
+        return brandCode;
+    }
+
+    public void setBrandCode(String brandCode) {
+        this.brandCode = brandCode;
+    }
+
+    public String getSalesModel() {
+        return salesModel;
+    }
+
+    public void setSalesModel(String salesModel) {
+        this.salesModel = salesModel;
+    }
+
+    public String getProductionBase() {
+        return productionBase;
+    }
+
+    public void setProductionBase(String productionBase) {
+        this.productionBase = productionBase;
+    }
+
+    public String getIsZeroExecution() {
+        return isZeroExecution;
+    }
+
+    public void setIsZeroExecution(String isZeroExecution) {
+        this.isZeroExecution = isZeroExecution;
+    }
+
+    public Date getScheduleTime() {
+        return scheduleTime;
+    }
+
+    public void setScheduleTime(Date scheduleTime) {
+        this.scheduleTime = scheduleTime;
+    }
+
+    public Date getLastAdjustTime() {
+        return lastAdjustTime;
+    }
+
+    public void setLastAdjustTime(Date lastAdjustTime) {
+        this.lastAdjustTime = lastAdjustTime;
+    }
+
+    public Date getAdjustTime() {
+        return adjustTime;
+    }
+
+    public void setAdjustTime(Date adjustTime) {
+        this.adjustTime = adjustTime;
+    }
+
+    public Integer getLastWeekQty() {
+        return lastWeekQty;
+    }
+
+    public void setLastWeekQty(Integer lastWeekQty) {
+        this.lastWeekQty = lastWeekQty;
+    }
+
+    public Integer getCurrentWeekQty() {
+        return currentWeekQty;
+    }
+
+    public void setCurrentWeekQty(Integer currentWeekQty) {
+        this.currentWeekQty = currentWeekQty;
+    }
+
+    public Integer getQtyDifference() {
+        return qtyDifference;
+    }
+
+    public void setQtyDifference(Integer qtyDifference) {
+        this.qtyDifference = qtyDifference;
+    }
+
+    public String getOrderStage() {
+        return orderStage;
+    }
+
+    public void setOrderStage(String orderStage) {
+        this.orderStage = orderStage;
+    }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getPackingMethod() {
+        return packingMethod;
+    }
+
+    public void setPackingMethod(String packingMethod) {
+        this.packingMethod = packingMethod;
+    }
+
+    public String getPlanSequence() {
+        return planSequence;
+    }
+
+    public void setPlanSequence(String planSequence) {
+        this.planSequence = planSequence;
+    }
+
+    public String getIsFirstOrder() {
+        return isFirstOrder;
+    }
+
+    public void setIsFirstOrder(String isFirstOrder) {
+        this.isFirstOrder = isFirstOrder;
+    }
+
+    public String getIsDirectDelivery() {
+        return isDirectDelivery;
+    }
+
+    public void setIsDirectDelivery(String isDirectDelivery) {
+        this.isDirectDelivery = isDirectDelivery;
+    }
+
+    public String getScreenRequirement() {
+        return screenRequirement;
+    }
+
+    public void setScreenRequirement(String screenRequirement) {
+        this.screenRequirement = screenRequirement;
+    }
+
+    public String getPanelManufacturer() {
+        return panelManufacturer;
+    }
+
+    public void setPanelManufacturer(String panelManufacturer) {
+        this.panelManufacturer = panelManufacturer;
+    }
+
+    public String getPanelRequirement() {
+        return panelRequirement;
+    }
+
+    public void setPanelRequirement(String panelRequirement) {
+        this.panelRequirement = panelRequirement;
+    }
+
+    public String getCoreRequirement() {
+        return coreRequirement;
+    }
+
+    public void setCoreRequirement(String coreRequirement) {
+        this.coreRequirement = coreRequirement;
+    }
+
+    public String getProductCategory() {
+        return productCategory;
+    }
+
+    public void setProductCategory(String productCategory) {
+        this.productCategory = productCategory;
+    }
+
+    public String getProductSize() {
+        return productSize;
+    }
+
+    public void setProductSize(String productSize) {
+        this.productSize = productSize;
+    }
+
+    public String getLockWeek() {
+        return lockWeek;
+    }
+
+    public void setLockWeek(String lockWeek) {
+        this.lockWeek = lockWeek;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IRollingPlanService.java

@@ -42,6 +42,14 @@ public interface IRollingPlanService
      */
     public int updateRollingPlan(RollingPlan rollingPlan);
 
+    /**
+     * 查询滚动计划审核列表
+     * 
+     * @param rollingPlan 滚动计划
+     * @return 滚动计划集合
+     */
+    public List<RollingPlan> selectRollingPlanAuditList(RollingPlan rollingPlan);
+
     /**
      * 审核滚动计划
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RollingPlanServiceImpl.java

@@ -1,12 +1,13 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+import java.util.Date;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.common.utils.DateUtils;  // 添加 DateUtils 的导入
 import com.ruoyi.system.mapper.RollingPlanMapper;
 import com.ruoyi.system.domain.RollingPlan;
 import com.ruoyi.system.service.IRollingPlanService;
-import com.ruoyi.common.utils.DateUtils;  // 添加 DateUtils 工具类的导入
 
 /**
  * 滚动计划Service业务层处理
@@ -93,6 +94,18 @@ public class RollingPlanServiceImpl implements IRollingPlanService
         return rollingPlanMapper.deleteRollingPlanByPlanId(planId);
     }
 
+    /**
+     * 查询滚动计划审核列表
+     * 
+     * @param rollingPlan 滚动计划
+     * @return 滚动计划集合
+     */
+    @Override
+    public List<RollingPlan> selectRollingPlanAuditList(RollingPlan rollingPlan)
+    {
+        return rollingPlanMapper.selectRollingPlanList(rollingPlan);
+    }
+
     /**
      * 审核滚动计划
      * 
@@ -102,7 +115,6 @@ public class RollingPlanServiceImpl implements IRollingPlanService
     @Override
     public int auditRollingPlan(RollingPlan rollingPlan)
     {
-        rollingPlan.setAuditTime(DateUtils.getNowDate());
         return rollingPlanMapper.updateRollingPlan(rollingPlan);
     }
 }

ruoyi-system/src/main/resources/mapper/system/RollingPlanMapper.xml

@@ -48,7 +48,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRollingPlanVo">
-        select plan_id, plan_number, machine_code, plan_year, version_week, production_mode, status, sales_area_code, country_code, sales_coordinator, customer_name, production_version, brand_code, sales_model, production_base, is_zero_execution, schedule_time, last_adjust_time, adjust_time, last_week_qty, current_week_qty, qty_difference, order_stage, order_type, packing_method, plan_sequence, is_first_order, is_direct_delivery, screen_requirement, panel_manufacturer, panel_requirement, core_requirement, product_category, product_size, remark, lock_week, create_by, create_time, update_by, update_time from rolling_plan
+        select plan_id, plan_number, machine_code, plan_year, version_week, production_mode, status, 
+        audit_status, audit_by, audit_time, audit_remark,
+        sales_area_code, country_code, sales_coordinator, customer_name, production_version, 
+        brand_code, sales_model, production_base, is_zero_execution, schedule_time, 
+        last_adjust_time, adjust_time, last_week_qty, current_week_qty, qty_difference, 
+        order_stage, order_type, packing_method, plan_sequence, is_first_order, 
+        is_direct_delivery, screen_requirement, panel_manufacturer, panel_requirement, 
+        core_requirement, product_category, product_size, remark, lock_week, 
+        create_by, create_time, update_by, update_time 
+        from rolling_plan
     </sql>
 
     <select id="selectRollingPlanList" parameterType="RollingPlan" resultMap="RollingPlanResult">
@@ -59,11 +68,74 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planYear != null "> and plan_year = #{planYear}</if>
             <if test="versionWeek != null  and versionWeek != ''"> and version_week = #{versionWeek}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
         </where>
         order by create_time desc
     </select>
 
+    <!-- 在 insert 和 update 语句中添加审核相关字段 -->
+    <insert id="insertRollingPlan" parameterType="RollingPlan" useGeneratedKeys="true" keyProperty="planId">
+        <!-- 已有字段保持不变 -->
+        <if test="auditStatus != null">audit_status,</if>
+        <if test="auditBy != null">audit_by,</if>
+        <if test="auditTime != null">audit_time,</if>
+        <if test="auditRemark != null">audit_remark,</if>
+        <!-- values部分也需要添加对应的值 -->
+        <if test="auditStatus != null">#{auditStatus},</if>
+        <if test="auditBy != null">#{auditBy},</if>
+        <if test="auditTime != null">#{auditTime},</if>
+        <if test="auditRemark != null">#{auditRemark},</if>
+    </insert>
+
+    <!-- 修改滚动计划 -->
+    <update id="updateRollingPlan" parameterType="RollingPlan">
+        update rolling_plan
+        <set>
+            <if test="planNumber != null">plan_number = #{planNumber},</if>
+            <if test="machineCode != null">machine_code = #{machineCode},</if>
+            <if test="planYear != null">plan_year = #{planYear},</if>
+            <if test="versionWeek != null">version_week = #{versionWeek},</if>
+            <if test="productionMode != null">production_mode = #{productionMode},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="salesAreaCode != null">sales_area_code = #{salesAreaCode},</if>
+            <if test="countryCode != null">country_code = #{countryCode},</if>
+            <if test="salesCoordinator != null">sales_coordinator = #{salesCoordinator},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="productionVersion != null">production_version = #{productionVersion},</if>
+            <if test="brandCode != null">brand_code = #{brandCode},</if>
+            <if test="salesModel != null">sales_model = #{salesModel},</if>
+            <if test="productionBase != null">production_base = #{productionBase},</if>
+            <if test="isZeroExecution != null">is_zero_execution = #{isZeroExecution},</if>
+            <if test="currentWeekQty != null">current_week_qty = #{currentWeekQty},</if>
+            <if test="lastWeekQty != null">last_week_qty = #{lastWeekQty},</if>
+            <if test="qtyDifference != null">qty_difference = #{qtyDifference},</if>
+            <if test="orderStage != null">order_stage = #{orderStage},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="packingMethod != null">packing_method = #{packingMethod},</if>
+            <if test="planSequence != null">plan_sequence = #{planSequence},</if>
+            <if test="isFirstOrder != null">is_first_order = #{isFirstOrder},</if>
+            <if test="isDirectDelivery != null">is_direct_delivery = #{isDirectDelivery},</if>
+            <if test="screenRequirement != null">screen_requirement = #{screenRequirement},</if>
+            <if test="panelManufacturer != null">panel_manufacturer = #{panelManufacturer},</if>
+            <if test="panelRequirement != null">panel_requirement = #{panelRequirement},</if>
+            <if test="coreRequirement != null">core_requirement = #{coreRequirement},</if>
+            <if test="productCategory != null">product_category = #{productCategory},</if>
+            <if test="productSize != null">product_size = #{productSize},</if>
+            <if test="lockWeek != null">lock_week = #{lockWeek},</if>
+            <if test="scheduleTime != null">schedule_time = #{scheduleTime},</if>
+            <if test="adjustTime != null">adjust_time = #{adjustTime},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="auditBy != null">audit_by = #{auditBy},</if>
+            <if test="auditTime != null">audit_time = #{auditTime},</if>
+            <if test="auditRemark != null">audit_remark = #{auditRemark},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </set>
+        where plan_id = #{planId}
+    </update>
+
     <select id="selectRollingPlanByPlanId" parameterType="Long" resultMap="RollingPlanResult">
         <include refid="selectRollingPlanVo"/>
         where plan_id = #{planId}