Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceQualityInspectionPlanDao.java

@@ -27,4 +27,7 @@ public interface IotDeviceQualityInspectionPlanDao extends PagingAndSortingRepos
    @Query(value = "SELECT a.* from iot_device_quality_inspection_plan a WHERE a.purchase_id = ?1 and a.status=?2 and a.del=1 ORDER BY a.plan_time desc limit 1",nativeQuery = true)
    IotDeviceQualityInspectionPlanDO findLastByPurchaseId(String purchaseId,String status);
    @Query(value = "SELECT a.* from iot_device_quality_inspection_plan a WHERE a.purchase_id = ?1 and a.status=?2 and a.del=1 ORDER BY a.plan_time asc limit 1",nativeQuery = true)
    IotDeviceQualityInspectionPlanDO findFirstByPurchaseId(String purchaseId,String status);
}

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceQualityInspectionPlanService.java

@@ -66,7 +66,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
        iotDeviceQualityInspectionPlan.setStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
        iotDeviceQualityInspectionPlan.setDel(1);
        //更新采购清单的质检信息
        if(StringUtils.isBlank(purchaseDO.getQualityStatus())
        if(StringUtils.isBlank(purchaseDO.getQualityStatus())||purchaseDO.getQualityStatus().equals(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue())
                ||(iotDeviceQualityInspectionPlan.getPlanTime().getTime()-purchaseDO.getNextQualityTime().getTime())<0){
            purchaseDO.setQualityStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
            purchaseDO.setNextQualityTime(iotDeviceQualityInspectionPlan.getPlanTime());
@@ -104,7 +104,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
     * @param purchaseId
     */
    public void completePlanByPurchaseId(String purchaseId,String time){
        IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanDao.findLastByPurchaseId(purchaseId,IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
        IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanDao.findFirstByPurchaseId(purchaseId,IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
        if(planDO!=null){
            planDO.setStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            planDO.setActualTime(DateUtil.strToDate(time));
@@ -136,6 +136,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
                purchaseDO.setQualityStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            }
            iotOrderPurchaseDao.save(purchaseDO);
            iotDeviceDao.updateQualityTime(purchaseDO.getNextQualityTime(),purchaseDO.getId());
        }else {
            IotDeviceQualityInspectionPlanDO last = list.get(0);
            IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(purchaseId);
@@ -143,6 +144,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
            purchaseDO.setNextQualityTime(last.getPlanTime());
            purchaseDO.setQualityLeader(last.getQualityLeader());
            iotOrderPurchaseDao.save(purchaseDO);
            iotDeviceDao.updateQualityTime(purchaseDO.getNextQualityTime(),purchaseDO.getId());
        }
    }