Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java

@@ -72,8 +72,8 @@ public class WmsCheckItemController extends BaseController {
     @Log(title = "检查项", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) {
-        return toAjax(iWmsCheckItemService.insertByBo(bo));
+        return R.ok(iWmsCheckItemService.insertByBo(bo));
     }
 
     /**

klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java

@@ -49,4 +49,6 @@ public class WmsCheckItem extends BaseEntity {
     private String unit;
     //定性定量
     private Integer qualitativeQuantitative;
+    //单个样品分析时间
+    private String sampleAnalysisTime;
 }

klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java

@@ -43,5 +43,7 @@ public class WmsCheckItemBo extends BaseEntity {
     private String unit;
     //定性定量
     private Integer qualitativeQuantitative;
+    //单个样品分析时间
+    private String sampleAnalysisTime;
 
 }

klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java

@@ -53,6 +53,9 @@ public class WmsCheckItemVo {
     private String unit;
     //定性定量
     private Integer qualitativeQuantitative;
+    //单个样品分析时间
+    @ExcelProperty(value = "单个样品分析时间")
+    private String sampleAnalysisTime;
 
     private  Long checkTaskItemId;
 

klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java

@@ -35,7 +35,7 @@ public interface IWmsCheckItemService {
     /**
      * 新增检查项
      */
-    Boolean insertByBo(WmsCheckItemBo bo);
+    Long insertByBo(WmsCheckItemBo bo);
 
     /**
      * 修改检查项

klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java

@@ -69,6 +69,7 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService {
         lqw.eq(bo.getStandardTarget() != null, WmsCheckItem::getStandardTarget, bo.getStandardTarget());
         lqw.like(StringUtils.isNotBlank(bo.getUnit()), WmsCheckItem::getUnit, bo.getUnit());
         lqw.eq(bo.getQualitativeQuantitative() != null, WmsCheckItem::getQualitativeQuantitative, bo.getQualitativeQuantitative());
+        lqw.like(StringUtils.isNotBlank(bo.getSampleAnalysisTime()), WmsCheckItem::getSampleAnalysisTime, bo.getSampleAnalysisTime());
         return lqw;
     }
 
@@ -76,14 +77,14 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService {
      * 新增检查项
      */
     @Override
-    public Boolean insertByBo(WmsCheckItemBo bo) {
+    public Long insertByBo(WmsCheckItemBo bo) {
         WmsCheckItem add = BeanUtil.toBean(bo, WmsCheckItem.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setItemId(add.getItemId());
         }
-        return flag;
+        return add.getItemId();
     }
 
     /**

klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml

@@ -13,6 +13,7 @@
         <result property="standardTarget" column="standard_target"/>
         <result property="unit" column="unit"/>
         <result property="qualitativeQuantitative" column="qualitative_quantitative"/>
+        <result property="sampleAnalysisTime" column="sample_analysis_time"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -28,6 +29,7 @@
         standard_target,
         unit,
         qualitative_quantitative,
+        sample_analysis_time,
         create_by,
         create_time,
         update_by,

klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java

@@ -35,6 +35,14 @@ public class WmsBonusPool extends BaseEntity {
      * 奖金时间/统计时间
      */
     private Date bonusTime;
+    /**
+     * 开始时间
+     */
+    private Date bonusStartTime;
+    /**
+     * 结束时间
+     */
+    private Date bonusEndTime;
     /**
      * 奖金池总金额
      */

klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java

@@ -38,6 +38,20 @@ public class WmsBonusPoolBo extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date bonusTime;
 
+    /**
+     * 开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date bonusStartTime;
+
+    /**
+     * 结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date bonusEndTime;
+
     /**
      * 奖金池总金额
      */

klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java

@@ -39,8 +39,23 @@ public class WmsBonusPoolVo extends BaseEntity {
      * 奖金时间/统计时间
      */
     @ExcelProperty(value = "奖金时间/统计时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date bonusTime;
 
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date bonusStartTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date bonusEndTime;
+
     /**
      * 奖金池总金额
      */

klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java

@@ -63,6 +63,8 @@ public class WmsBonusPoolServiceImpl implements IWmsBonusPoolService {
         LambdaQueryWrapper<WmsBonusPool> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsBonusPool::getProductionLine, bo.getProductionLine());
         lqw.eq(bo.getBonusTime() != null, WmsBonusPool::getBonusTime, bo.getBonusTime());
+        lqw.eq(bo.getBonusStartTime() != null, WmsBonusPool::getBonusStartTime, bo.getBonusStartTime());
+        lqw.eq(bo.getBonusEndTime() != null, WmsBonusPool::getBonusEndTime, bo.getBonusEndTime());
         lqw.eq(bo.getTotalBonus() != null, WmsBonusPool::getTotalBonus, bo.getTotalBonus());
         lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), WmsBonusPool::getCreateBy, bo.getCreateBy());
         return lqw;

klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml

@@ -8,6 +8,8 @@
         <result property="poolId" column="pool_id"/>
         <result property="productionLine" column="production_line"/>
         <result property="bonusTime" column="bonus_time"/>
+        <result property="bonusStartTime" column="bonus_start_time"/>
+        <result property="bonusEndTime" column="bonus_end_time"/>
         <result property="totalBonus" column="total_bonus"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>