kangwei ：采购计划的选择物料，去年数据使用计划表单的计划年参数

@@ -8,6 +8,7 @@ import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.query.QueryGenerator;
 import com.skua.core.query.QueryGenerator;
 import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.ConvertUtils;
+import com.skua.core.util.DateUtils;
 import com.skua.modules.equipment.service.IEquipmentSparepartService;
 import com.skua.modules.equipment.service.IEquipmentSparepartService;
 import com.skua.modules.erp.entity.ApproveRecord;
 import com.skua.modules.erp.entity.ApproveRecord;
 import com.skua.modules.erp.entity.PurchaseMaterial;
 import com.skua.modules.erp.entity.PurchaseMaterial;
@@ -15,6 +16,7 @@ import com.skua.modules.erp.service.IDistributMaterialService;
 import com.skua.modules.erp.service.IPurchaseMaterialService;
 import com.skua.modules.erp.service.IPurchaseMaterialService;
 import com.skua.modules.erp.vo.MaterialSearchVO;
 import com.skua.modules.erp.vo.MaterialSearchVO;
 import com.skua.modules.erp.vo.PurchaseMaterialVO;
 import com.skua.modules.erp.vo.PurchaseMaterialVO;
+import com.skua.modules.guest.util.DateUtil;
 import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
 import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
 import com.skua.modules.supplies.entity.EquipmentSparepartType;
 import com.skua.modules.supplies.entity.EquipmentSparepartType;
@@ -64,9 +66,13 @@ public class ErpCommonController {
                 sparepartTypeStr = String.join(",", sparepartTypeSet);
                 sparepartTypeStr = String.join(",", sparepartTypeSet);
             }
             }
         }
         }
+        Integer applyYear = DateUtils.getYear() -1;
+        if(materialSearchVO.getApplyYear() != null ){
+            applyYear =materialSearchVO.getApplyYear() -1;
+        }
        // String depId = BaseContextHandler.getRealDepartId();//临时参数
        // String depId = BaseContextHandler.getRealDepartId();//临时参数
        // String username = req.getParameter("username");
        // String username = req.getParameter("username");
-        IPage<EquipmentSparepartSupplies> pageList = sparepartSuppliesService.queryPageByOut(page  , materialSearchVO.getSparepartName() ,sparepartTypeStr ,materialSearchVO.getSparepartCode());
+        IPage<EquipmentSparepartSupplies> pageList = sparepartSuppliesService.queryPageByOut(page  , materialSearchVO.getSparepartName() ,sparepartTypeStr ,materialSearchVO.getSparepartCode(),applyYear);
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(pageList);
         result.setResult(pageList);
         return result;
         return result;

@@ -19,6 +19,9 @@ public class MaterialSearchVO {
     @ApiModelProperty(value = "分销合同编号")
     @ApiModelProperty(value = "分销合同编号")
     private String distributContractId;
     private String distributContractId;
 
 
+    @ApiModelProperty(value = "计划年份")
+    private Integer applyYear;
+
     @ApiModelProperty(value = "物料编号")
     @ApiModelProperty(value = "物料编号")
     private String sparepartCode;
     private String sparepartCode;
 
 

@@ -19,5 +19,5 @@ public interface EquipmentSparepartSuppliesMapper extends BaseMapper<EquipmentSp
      * @return
      * @return
      */
      */
     public IPage<EquipmentSparepartSupplies> selectPageByOut(Page<EquipmentSparepartSupplies> page,@Param("sparepartName")String sparepartName,
     public IPage<EquipmentSparepartSupplies> selectPageByOut(Page<EquipmentSparepartSupplies> page,@Param("sparepartName")String sparepartName,
-                                                            @Param("sparepartType")String sparepartType ,@Param("sparepartCode")String sparepartCode);
+                                                            @Param("sparepartType")String sparepartType ,@Param("sparepartCode")String sparepartCode, @Param("applyYear")Integer applyYear);
 }
 }

@@ -9,7 +9,7 @@
         left join (
         left join (
         select sum(out_num) out_num  ,sparepart_id   from equipment_out_child
         select sum(out_num) out_num  ,sparepart_id   from equipment_out_child
             where
             where
-                YEAR(create_time) = YEAR(CURRENT_DATE - INTERVAL 1 YEAR)
+                YEAR(create_time) = #{applyYear}
                 group by sparepart_id
                 group by sparepart_id
         )  aaa on aaa.sparepart_id = ss.id
         )  aaa on aaa.sparepart_id = ss.id
         <where>
         <where>

@@ -15,5 +15,5 @@ public interface IEquipmentSparepartSuppliesService extends IService<EquipmentSp
      * @param depId
      * @param depId
      * @return
      * @return
      */
      */
-    public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page, String sparepartName,String sparepartType ,String sparepartCode);
+    public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page, String sparepartName,String sparepartType ,String sparepartCode ,Integer applyYear);
 }
 }

@@ -20,7 +20,7 @@ public class EquipmentSparepartSuppliesServiceImpl extends ServiceImpl<Equipment
      * @param
      * @param
      * @return
      * @return
      */
      */
-    public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page ,String sparepartName,String sparepartType ,String sparepartCode){
-        return baseMapper.selectPageByOut(page ,sparepartName,sparepartType,sparepartCode);
+    public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page ,String sparepartName,String sparepartType ,String sparepartCode,Integer applyYear){
+        return baseMapper.selectPageByOut(page ,sparepartName,sparepartType,sparepartCode,applyYear);
     }
     }
 }
 }