Merge remote-tracking branch 'origin/master'

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java

@@ -11,7 +11,6 @@ import com.hnac.hzims.spare.entity.SpWarehouseOutEntity;
 import com.hnac.hzims.spare.service.ISpWarehouseOutService;
 import com.hnac.hzims.spare.vo.SpWarehouseExportVO;
 import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
-import com.hnac.hzims.vo.VoteChartVo;
 import com.hnac.hzinfo.log.annotation.Business;
 import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
@@ -39,7 +38,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
-
 /**
  *  控制器
  *
@@ -81,6 +79,7 @@ public class SpWarehouseOutController extends BladeController {
 		IPage<SpWarehouseOutVO> pages = sp_warehouse_outService.selectPageList(Condition.getPage(query),warehouseOutVO);
 		return R.data(pages);
 	}
+
 	/**
 	 * 分页 代码自定义代号
 	 */
@@ -120,6 +119,7 @@ public class SpWarehouseOutController extends BladeController {
 			e.printStackTrace();
 		}
 	}
+
 	/**
 	 * 工单预警
 	 */
@@ -165,7 +165,6 @@ public class SpWarehouseOutController extends BladeController {
 		return R.status(sp_warehouse_outService.saveOrUpdate(sp_warehouse_out));
 	}
 
-
 	/**
 	 * 删除 代码自定义代号
 	 */
@@ -176,6 +175,7 @@ public class SpWarehouseOutController extends BladeController {
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sp_warehouse_outService.deleteLogic(Func.toLongList(ids)));
 	}
+
 	/**
 	 * 完成流程 修改状态
 	 */

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java

@@ -1,10 +1,8 @@
 package com.hnac.hzims.spare.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.SpWarehouseOutEntity;
 import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
-import feign.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -19,6 +17,7 @@ import java.util.Map;
 public interface SpWarehouseOutMapper extends UserDataScopeBaseMapper<SpWarehouseOutEntity> {
 
     String selectMaxCode(Map<String,Object> params);
+
     /**
      * 分页列表
      * @param page
@@ -27,8 +26,10 @@ public interface SpWarehouseOutMapper extends UserDataScopeBaseMapper<SpWarehous
      */
 	@UserDataAuth
     List<SpWarehouseOutVO> selectPageList(IPage<SpWarehouseOutVO> page, Map<String,Object> params);
-//    @UserDataAuth
+
+    @UserDataAuth
     List<SpWarehouseOutVO> selectListByCondition( Map<String,Object> params);
+
     /**
      * 根据工单ID查询出库单编码
      * @param ticketId

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java

@@ -17,15 +17,12 @@ import com.hnac.hzims.spare.vo.WtSpBasicVO;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springblade.core.launch.constant.FlowConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.ISysClient;
@@ -34,13 +31,11 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  *  服务实现类

hzims-service/equipment/src/main/resources/db/2.0.0.sql.1

@@ -32,4 +32,7 @@ update bladex.blade_dict set dict_key = '2' where id = 1675699613977288706;
 update equipment.hzims_em_definition set type = '2' where type = '0';
 
 update bladex.blade_dict set dict_key = '2' where id = 1675699613977288706;
-update equipment.hzims_em_definition set type = '2' where type = '0';
+update equipment.hzims_em_definition set type = '2' where type = '0';
+
+-- 修改故障诊断任务表的字符集
+ALTER TABLE hzims_fdp_task CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;