consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java

@@ -18,14 +18,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
@@ -34,6 +32,8 @@
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.ImportUserParam;
import com.consum.base.pojo.request.FinSysTenantUserParam;
import com.consum.base.pojo.response.DepartmentVO;
import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.base.pojo.response.FinSysTenantVO;
@@ -205,43 +205,45 @@
    @PostMapping("/add")
    @Transactional(rollbackFor = Exception.class)
    public ResponseValue add() {
        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
        FinSysTenantUser formInventoryParam = new FinSysTenantUser();
        CommonUtil.copyProperties(user, formInventoryParam);
        user = formInventoryParam;
        if (user == null) {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUser tenantUser = new FinSysTenantUser();
        CommonUtil.copyProperties(user, tenantUser);

        if (tenantUser == null) {
            return ResponseValue.error("参数为空");
        }
        // 根据员工编号查询，如果存在则提示
        if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
            && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
        if (finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) != null
            && finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) > 0) {
            return ResponseValue.error("员工编号重复");
        }
        if (user.getTenantId() == null || "".equals(user.getTenantId()) || new Integer(user.getTenantId()) == 0) {

        if (StringUtils.isEmpty(tenantUser.getTenantId()) || "0".equals(tenantUser.getTenantId())) {
            return ResponseValue.error("添加时请选择区县");
        }
        if (user.getTenantCode() == null || "".equals(user.getTenantCode()) || new Integer(user.getTenantCode()) == 0) {

        if (StringUtils.isEmpty(tenantUser.getTenantCode()) || "0".equals(tenantUser.getTenantCode())) {
            return ResponseValue.error("添加时请选择区县");
        }
        // 插入系统用户
        user.setId(NumberGenerator.getLongSequenceNumber());
        user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        user.setCreateBy(this.getCurrentUser().getUser_name());
        user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        user.setUpdateBy(this.getCurrentUser().getUser_name());
        tenantUser.setId(NumberGenerator.getLongSequenceNumber());
        tenantUser.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        tenantUser.setCreateBy(this.getCurrentUser().getUser_name());
        tenantUser.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        tenantUser.setUpdateBy(this.getCurrentUser().getUser_name());
        // user.setStatus(1);// 0禁用 1启用
        user.setIsDelete(0);
        user.setSysUserId(NumberGenerator.getLongSequenceNumber());
        tenantUser.setIsDelete(0);
        tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
        // 加密手机号
        String key = PlatformRSAUtils.AES_KEY;
        String encPhone = "";
        if (user.getUserPhone() != null) {
            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
        if (tenantUser.getUserPhone() != null) {
            encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
        }
        user.setUserPhone(encPhone);
        tenantUser.setUserPhone(encPhone);
        // 怎么获取左侧机构树数据
        user.setSysDeptId(3L); // 对应平台机构id 默认为平台管理
        this.finSysTenantUserService.insert(user);
        tenantUser.setSysDeptId(3L); // 对应平台机构id 默认为平台管理
        this.finSysTenantUserService.insert(tenantUser);
        // 插入平台用户
        S_user_core userCore = new S_user_core();
        userCore.setId(user.getSysUserId());
@@ -296,80 +298,6 @@
        }
        // this.getFinCustomerCache().remove();
        return ResponseValue.success(1);
    }

    public static class ImportUserParam {

        @ExcelProperty("用户姓名")
        private String userName;
        @ExcelProperty("用户编号")
        private String userCode;
        @ExcelProperty("手机号")
        private String userPhone;
        @ExcelProperty("性别(1男，2女)")
        private Integer sex;
        @ExcelProperty("电子邮箱")
        private String email;
        @ExcelProperty("顺序号")
        private Long seq;
        @ExcelProperty("角色名称")
        private String roleName;

        public String getUserName() {
            return userName;
        }

        public void setUserName(String userName) {
            this.userName = userName;
        }

        public String getUserCode() {
            return userCode;
        }

        public void setUserCode(String userCode) {
            this.userCode = userCode;
        }

        public String getUserPhone() {
            return userPhone;
        }

        public void setUserPhone(String userPhone) {
            this.userPhone = userPhone;
        }

        public Integer getSex() {
            return sex;
        }

        public void setSex(Integer sex) {
            this.sex = sex;
        }

        public String getEmail() {
            return email;
        }

        public void setEmail(String email) {
            this.email = email;
        }

        public Long getSeq() {
            return seq;
        }

        public void setSeq(Long seq) {
            this.seq = seq;
        }

        public String getRoleName() {
            return roleName;
        }

        public void setRoleName(String roleName) {
            this.roleName = roleName;
        }
    }

    /**
@@ -557,18 +485,22 @@
     */
    @PostMapping("/update")
    @Transactional(rollbackFor = Exception.class)
    public ResponseValue update(@RequestBody FinSysTenantUser user) {
        if (user == null) {
    public ResponseValue update() {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUser tenantUser = new FinSysTenantUser();
        CommonUtil.copyProperties(user, tenantUser);

        if (tenantUser == null) {
            return ResponseValue.error("参数为空");
        }
        String key = PlatformRSAUtils.AES_KEY;
        String encPhone = "";
        if (user.getUserPhone() != null) {
            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
        if (tenantUser.getUserPhone() != null) {
            encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
        }
        user.setUserPhone(encPhone);
        tenantUser.setUserPhone(encPhone);
        // 1.更新系统用户 FIN_SYS_TENANT_USER
        finSysTenantUserService.update(user);
        finSysTenantUserService.update(tenantUser);
        // 2.更新平台用户 S_USER_CORE
        S_user_core userCore = new S_user_core();
        userCore.setId(user.getSysUserId());
@@ -611,12 +543,15 @@
     */
    @PostMapping("/updateStatus")
    @Transactional(rollbackFor = Exception.class)
    public ResponseValue updateStatus(@RequestBody FinSysTenantUser user) {
        if (user == null) {
    public ResponseValue updateStatus() {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUser tenantUser = new FinSysTenantUser();
        CommonUtil.copyProperties(user, tenantUser);
        if (tenantUser == null) {
            return ResponseValue.error("参数为空");
        }
        // 1.更新系统用户 FIN_SYS_TENANT_USER 应该是查询 然后只改状态
        List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(user.getId()));
        List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(tenantUser.getId()));
        if (select == null || select.size() == 0) {
            return ResponseValue.error("用户不存在");
        }
@@ -645,15 +580,20 @@
     * @Date 2023/7/17 14:36
     */
    @PostMapping("/defaultPassword")
    public ResponseValue defaultPassword(@RequestBody FinSysTenantUser finSysTenantUser) {
        if (finSysTenantUser == null) {
    public ResponseValue defaultPassword() {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
        CommonUtil.copyProperties(user, tenantUser);
        user = tenantUser;

        if (Objects.isNull(user)) {
            return ResponseValue.error("用户信息不存在");
        }
        // 初始化密码 123456
        String stringValue = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();// 密文
        // 1. 修改用户表
        // 用户表id
        Long sysUserId = finSysTenantUser.getSysUserId();
        Long sysUserId = user.getSysUserId();
        S_user_core userCore = new S_user_core();
        userCore.setId(sysUserId);
        userCore.setPassword(stringValue);
@@ -739,11 +679,15 @@
    /**
     * 更新角色权限
     *
     * @param user
     * @return
     */
    @PostMapping("/updRole")
    public ResponseValue updRole(@RequestBody FinSysTenantUser user) {
    public ResponseValue updRole() {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
        CommonUtil.copyProperties(user, tenantUser);
        user = tenantUser;

        if (user == null) {
            return ResponseValue.error("参数为空");
        }
@@ -767,7 +711,11 @@
     */
    @PostMapping("/addSupplier")
    @Transactional(rollbackFor = Exception.class)
    public ResponseValue addSupplier(@RequestBody FinSysTenantUser user) {
    public ResponseValue addSupplier() {
        FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUser user = new FinSysTenantUser();
        CommonUtil.copyProperties(userParam, user);

        if (user == null) {
            return ResponseValue.error("参数为空");
        }
@@ -879,28 +827,32 @@

    @PostMapping("/updatePerson")
    @Transactional(rollbackFor = Exception.class)
    public ResponseValue updatePerson(@RequestBody FinSysTenantUser user) {
        if (user == null) {
    public ResponseValue updatePerson() {
        FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
        CommonUtil.copyProperties(userParam, tenantUser);
        userParam = tenantUser;
        if (userParam == null) {
            return ResponseValue.error("参数为空");
        }
        FinSysTenantUser sysInfo = getSysInfo();
        if (sysInfo == null) {
            return ResponseValue.error("用户信息不存在");
        }
        String avatar = user.getAvatar();
        String avatar = userParam.getAvatar();
        if (!picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
            return ResponseValue.error("头像格式不允许");
        }
        FinSysTenantUser updUser = new FinSysTenantUser();
        updUser.setId(sysInfo.getId());
        updUser.setAvatar(user.getAvatar());
        updUser.setEmail(user.getEmail());
        updUser.setUserName(user.getUserName());
        updUser.setSex(user.getSex());
        updUser.setAvatar(userParam.getAvatar());
        updUser.setEmail(userParam.getEmail());
        updUser.setUserName(userParam.getUserName());
        updUser.setSex(userParam.getSex());
        String encPhone = "";
        if (user.getUserPhone() != null) {
        if (userParam.getUserPhone() != null) {
            String key = PlatformRSAUtils.AES_KEY;
            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
            encPhone = AESUtils.encryptStrAES(userParam.getUserPhone(), key);
        }
        updUser.setUserPhone(encPhone);
        // 1.更新系统用户 FIN_SYS_TENANT_USER
@@ -924,7 +876,12 @@
     * @Description 修改密码
     */
    @PostMapping("/updatePassword")
    public ResponseValue updatePassword(@RequestBody FinSysTenantUserUpdParam param) {
    public ResponseValue updatePassword() {
        FinSysTenantUserUpdParam param = CommonUtil.getObjFromReqBody(FinSysTenantUserUpdParam.class);
        FinSysTenantUserUpdParam finSysTenantParam = new FinSysTenantUserUpdParam();
        CommonUtil.copyProperties(param, finSysTenantParam);
        param = finSysTenantParam;

        String oldMixPd = param.getOldMixPd();
        String newMixPd = param.getNewMixPd();
        String btnMixPd = param.getBtnMixPd();

 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java

@@ -5,7 +5,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.stream.Collectors;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -23,10 +25,9 @@

import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWhFormOutputParam;
import com.consum.base.pojo.dto.GoodModelInfoDTO;
import com.consum.base.pojo.excel.OutputExcelTemplate;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.pojo.response.FormOutputGoodsVO;
@@ -154,35 +155,48 @@
        BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
        lWhFormOutputExtendVO.setDoc(lWhFormOutput.getOutputDoc());

        String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
            + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
            + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
            + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id ";
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("id", lWhFormOutputExtendVO.getId());
        List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());
        List<GoodModelInfoDTO> goodsModelList =
            lWhProcureModelService.getGoodsModelListByBusinessId(lWhFormOutputExtendVO.getId());
        if (CollectionUtils.isEmpty(goodsModelList)) {
            return ResponseValue.success(lWhFormOutputExtendVO);
        }
        Map<Long, List<GoodModelInfoDTO>> collect =
            goodsModelList.stream().collect(Collectors.groupingBy(GoodModelInfoDTO::getBaseGoodsTemplateId));
        List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList();
        for (Map<String, Object> map : procureModelList) {
            FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputGoodsVO.class);

            // 查询型号数量
            List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
            String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
                + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
                + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id";
            List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
            modelList.forEach(item -> {
                GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
                goodsModelVOList.add(goodsModelVO);
            });
            procureTemplateInfoVO.setModels(goodsModelVOList);
            fromOutputGoods.add(procureTemplateInfoVO);
        for (Map.Entry<Long, List<GoodModelInfoDTO>> entry : collect.entrySet()) {
            FormOutputGoodsVO formOutputGoodsVO = getFormOutputGoodsVO(entry);
            fromOutputGoods.add(formOutputGoodsVO);
        }
        lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods);

        return ResponseValue.success("查询成功!", lWhFormOutputExtendVO);
    }

    private static FormOutputGoodsVO getFormOutputGoodsVO(Entry<Long, List<GoodModelInfoDTO>> entry) {
        Long baseGoodsTemplateId = entry.getKey();
        List<GoodModelInfoDTO> goodModelInfoDTOS = entry.getValue();
        GoodModelInfoDTO goodModelInfoDTO = goodModelInfoDTOS.stream().findFirst().orElse(null);
        FormOutputGoodsVO formOutputGoodsVO = new FormOutputGoodsVO();
        if (goodModelInfoDTO != null) {
            formOutputGoodsVO.setId(baseGoodsTemplateId);
            formOutputGoodsVO.setCategoryId(goodModelInfoDTO.getCategoryId());
            formOutputGoodsVO.setCategoryName(goodModelInfoDTO.getCategoryName());
            formOutputGoodsVO.setGoodsName(goodModelInfoDTO.getBaseGoodsModelsName());
        }
        List<GoodsModelVO> goodsModelList = Lists.newArrayList();
        for (GoodModelInfoDTO goodModelInfo : goodModelInfoDTOS) {
            GoodsModelVO goodsModelVO = new GoodsModelVO();
            goodsModelVO.setId(goodModelInfo.getId());
            goodsModelVO.setBaseGoodsModelsName(goodModelInfo.getBaseGoodsModelsName());
            goodsModelVO.setUnit(goodModelInfo.getUnit());
            goodsModelVO.setCounts(goodModelInfo.getCounts());
            goodsModelVO.setTotalAmount(goodModelInfo.getTotalAmount());
            goodsModelList.add(goodsModelVO);
        }
        formOutputGoodsVO.setModels(goodsModelList);
        return formOutputGoodsVO;
    }

    @ApiOperation(value = "查询出库单详情明细", notes = "查询出库单详情明细")
    @ApiImplicitParam(name = "formOutputQry", value = "出库单详情查询条件", required = true, dataType = "LWhFormOutputQry",
        paramType = "query")

 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java

@@ -34,7 +34,7 @@
import com.consum.base.pojo.response.LWhFormProcureExtendVO;
import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.LWhFormProcureCoreService;
import com.consum.base.service.impl.LWhFormProcureCoreService;
import com.consum.base.service.LWhFormProcureGoodsService;
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhProcureModelService;

 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java

@@ -38,11 +38,12 @@
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.impl.LWhFormTransferCoreService;
import com.consum.base.service.LGoodsUserRecordCoreService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
import com.consum.base.service.LWhProcureModelUserService;
import com.consum.base.service.impl.LWhFormTransferCoreService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
@@ -84,6 +85,8 @@
    private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
    @Autowired
    private BaseWarehouseService baseWarehouseService;
    @Autowired
    private LGoodsUserRecordCoreService lGoodsUserRecordCoreService;

    /**
     * @Description 新增
@@ -399,9 +402,9 @@

                lWhProcureModelUserService.insert(procureModelUserList);
            }

            // 使用人修改调用
            lGoodsUserRecordCoreService.modifyGoodsUser(null, lWhProcureModelUserRecord.getId());
        }
        // TODO 使用人修改调用

        return ResponseValue.success();
    }

 consum-base/src/main/java/com/consum/base/controller/UsingFormBackController.java

@@ -1,6 +1,13 @@
package com.consum.base.controller;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.query.UsingFormBackQry;
import com.consum.base.pojo.request.UsingFormBackParam;
@@ -8,14 +15,9 @@
import com.consum.base.service.UsingFormBackService;
import com.consum.model.po.FinSysTenantUser;
import com.walker.web.ResponseValue;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @author asus
@@ -31,23 +33,30 @@
    @Autowired
    private UsingFormBackService usingFormBackService;


    @ApiOperation(value = "部门物品退回单新增接口", notes = "部门物品退回单新增接口")
    @PostMapping("/add")
    public ResponseValue add(@RequestBody UsingFormBackParam usingFormBackParam) {
    public ResponseValue add() {
        UsingFormBackParam usingFormBackParam = CommonUtil.getObjFromReqBody(UsingFormBackParam.class);
        UsingFormBackParam param2 = new UsingFormBackParam();
        CommonUtil.copyProperties(usingFormBackParam, param2);
        usingFormBackParam = param2;

        FinSysTenantUser sysInfo = getSysInfo();
        if (sysInfo == null) {
            return ResponseValue.error("请先登录");
        }
        usingFormBackService.add(usingFormBackParam, sysInfo,this.getCurrentUser());
        usingFormBackService.add(usingFormBackParam, sysInfo, this.getCurrentUser());
        return ResponseValue.success();
    }


    @ApiOperation(value = "部门物品退回单查询接口", notes = "部门物品退回单查询接口")
    @GetMapping("/list")
    public ResponseValue query(UsingFormBackQry usingFormBackParam) {
    public ResponseValue query() {
        UsingFormBackQry usingFormBackParam = CommonUtil.getObjFromReq(UsingFormBackQry.class);
        UsingFormBackQry param2 = new UsingFormBackQry();
        CommonUtil.copyProperties(usingFormBackParam, param2);
        usingFormBackParam = param2;

        FinSysTenantUser sysInfo = getSysInfo();
        if (sysInfo == null) {
            return ResponseValue.error("请先登录");
@@ -56,7 +65,6 @@
        PageUtil page = usingFormBackService.selectPageByList(usingFormBackParam);
        return ResponseValue.success(page);
    }


    @ApiOperation(value = "部门物品退回单详情接口", notes = "部门物品退回单详情接口")
    @GetMapping("/detail")
@@ -69,10 +77,14 @@
        return ResponseValue.success(detail);
    }


    @ApiOperation(value = "部门物品退回明细查询接口", notes = "部门物品退回明细查询接口")
    @GetMapping("/list/detail")
    public ResponseValue queryListDetail(UsingFormBackQry usingFormBackParam) {
    public ResponseValue queryListDetail() {
        UsingFormBackQry usingFormBackParam = CommonUtil.getObjFromReq(UsingFormBackQry.class);
        UsingFormBackQry param2 = new UsingFormBackQry();
        CommonUtil.copyProperties(usingFormBackParam, param2);
        usingFormBackParam = param2;

        FinSysTenantUser sysInfo = getSysInfo();
        if (sysInfo == null) {
            return ResponseValue.error("请先登录");

 consum-base/src/main/java/com/consum/base/core/AgencyEntity.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/AgencyService.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/CodeTemplateService.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/GoodsService.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/UnifyBusinessService.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/data/Base_CategoryService.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/po/SYS_AGENCY.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/po/WhFormInventory.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/po/WhFormProcure.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java

File was deleted

 consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/FinSysServerVo.java

@@ -3,130 +3,7 @@
import java.util.List;

public class FinSysServerVo {
//    // 主键
//    private Long id = null;
//    // 属性列表
//   // private Long createTime = null;
//    private Long createdTime = null;
//   // private String createUser = null;
//   private String createdBy = null;
//    private String name = null;
//    private String code = null;
//    //private Integer level = null;
//    private Integer lvType=null;
//    private Long lv = null;
//    private Long status = null;
//    private Long delFlag = null;
//    private Long parentId = null;
//    private List<FinSysServerVo> children=null;
//
//    public FinSysServerVo() {
//    }
//
//    public Long getId() {
//        return id;
//    }
//
//    public void setId(Long id) {
//        this.id = id;
//    }
//
//    public Long getCreatedTime() {
//        return createdTime;
//    }
//
//    public void setCreatedTime(Long createdTime) {
//        this.createdTime = createdTime;
//    }
//
//    public String getCreatedBy() {
//        return createdBy;
//    }
//
//    public void setCreatedBy(String createdBy) {
//        this.createdBy = createdBy;
//    }
//
//    public String getName() {
//        return name;
//    }
//
//    public void setName(String name) {
//        this.name = name;
//    }
//
//    public String getCode() {
//        return code;
//    }
//
//    public void setCode(String code) {
//        this.code = code;
//    }
//
//    public Integer getLvType() {
//        return lvType;
//    }
//
//    public void setLvType(Integer lvType) {
//        this.lvType = lvType;
//    }
//
//    public Long getLv() {
//        return lv;
//    }
//
//    public void setLv(Long lv) {
//        this.lv = lv;
//    }
//
//    public Long getStatus() {
//        return status;
//    }
//
//    public void setStatus(Long status) {
//        this.status = status;
//    }
//
//    public Long getDelFlag() {
//        return delFlag;
//    }
//
//    public void setDelFlag(Long delFlag) {
//        this.delFlag = delFlag;
//    }
//
//    public Long getParentId() {
//        return parentId;
//    }
//
//    public void setParentId(Long parentId) {
//        this.parentId = parentId;
//    }
//
//    public List<FinSysServerVo> getChildren() {
//        return children;
//    }
//
//    public void setChildren(List<FinSysServerVo> children) {
//        this.children = children;
//    }
//
//    @Override
//    public String toString() {
//        return "FinSysCategoryVo{" +
//                "id=" + id +
//                ", createdTime=" + createdTime +
//                ", createdBy='" + createdBy + '\'' +
//                ", name='" + name + '\'' +
//                ", code='" + code + '\'' +
//                ", lvType=" + lvType +
//                ", lv=" + lv +
//                ", status=" + status +
//                ", delFlag=" + delFlag +
//                ", parentId=" + parentId +
//                ", children=" + children +
//                '}';
//    }

    private Long id;
    private String label;
    private Long parentId;
@@ -139,8 +16,7 @@
        this.children = children;
    }

    public FinSysServerVo() {
    }
    public FinSysServerVo() {}

    public Long getId() {
        return id;

 consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserSearchParam.java

@@ -2,6 +2,9 @@

import com.walker.web.param.ParamRequest;

import lombok.Data;

@Data
public class FinSysTenantUserSearchParam extends ParamRequest {

    // 用户姓名
@@ -15,9 +18,6 @@
    private Integer status;

    private Long projectId;


   private String roleId;

    // 用户手机号
    private String userPhone;
@@ -39,116 +39,4 @@

    private Long sysUserId;

    public Long getUserId() {
        return userId;
    }

    public void setUserId(Long userId) {
        this.userId = userId;
    }

    public Long getSysUserId() {
        return sysUserId;
    }

    public void setSysUserId(Long sysUserId) {
        this.sysUserId = sysUserId;
    }

    public Long getStartTime() {
        return startTime;
    }

    public void setStartTime(Long startTime) {
        this.startTime = startTime;
    }

    public Long getEndTime() {
        return endTime;
    }

    public void setEndTime(Long endTime) {
        this.endTime = endTime;
    }

    public Integer getCtiStatus() {
        return ctiStatus;
    }

    public void setCtiStatus(Integer ctiStatus) {
        this.ctiStatus = ctiStatus;
    }

    public Long getProjectId() {
        return projectId;
    }

    public void setProjectId(Long projectId) {
        this.projectId = projectId;
    }

    public Integer getType() {
        return type;
    }

    public void setType(Integer type) {
        this.type = type;
    }

    public String getRoleId() {
        return roleId;
    }

    public void setRoleId(String roleId) {
        this.roleId = roleId;
    }

    public String getUserCode() {
        return userCode;
    }


    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }
    public void setUserCode(String userCode) {
        this.userCode = userCode;
    }

    public long getTenantCode() {
        return tenantCode;
    }

    public void setTenantCode(long tenantCode) {
        this.tenantCode = tenantCode;
    }

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    public String getUserPhone() {
        return userPhone;
    }

    public void setUserPhone(String userPhone) {
        this.userPhone = userPhone;
    }


    public Long getSupplierId() {
        return supplierId;
    }

    public void setSupplierId(Long supplierId) {
        this.supplierId = supplierId;
    }
}

 consum-base/src/main/java/com/consum/base/pojo/ImportUserParam.java

New file
@@ -0,0 +1,31 @@
package com.consum.base.pojo;

import com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

/**
 * @author asus
 * @version 1.0
 * @description: 导入用户参数
 * @date 2023/12/6 11:00
 */
@Data
public class ImportUserParam {

    @ExcelProperty("用户姓名")
    private String userName;
    @ExcelProperty("用户编号")
    private String userCode;
    @ExcelProperty("手机号")
    private String userPhone;
    @ExcelProperty("性别(1男，2女)")
    private Integer sex;
    @ExcelProperty("电子邮箱")
    private String email;
    @ExcelProperty("顺序号")
    private Long seq;
    @ExcelProperty("角色名称")
    private String roleName;

}

 consum-base/src/main/java/com/consum/base/pojo/LWhFormInventoryVo.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/UpdatePwdParam.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/dto/GoodModelInfoDTO.java

New file
@@ -0,0 +1,23 @@
package com.consum.base.pojo.dto;

import lombok.Data;

/**
 * @author asus
 * @version 1.0
 * @description: 物品型号转换
 * @date 2023/12/6 10:12
 */
@Data
public class GoodModelInfoDTO {

    private Long id;
    private Long categoryId;
    private String categoryName;
    private Long baseGoodsTemplateId;
    private String baseGoodsName;
    private String baseGoodsModelsName;
    private String unit;
    private Integer counts;
    private Integer totalAmount;
}

 consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/query/UsingFormBackQry.java

@@ -1,5 +1,7 @@
package com.consum.base.pojo.query;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,7 @@
 */
@Data
@ApiModel
@JsonIgnoreProperties(ignoreUnknown = true)
public class UsingFormBackQry {

    @ApiModelProperty(value = "主键")

 consum-base/src/main/java/com/consum/base/pojo/request/FinSysTenantUserParam.java

New file
@@ -0,0 +1,89 @@
package com.consum.base.pojo.request;

import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import lombok.Data;

/**
 * @author asus
 * @version 1.0
 * @description: 机构下用户参数
 * @date 2023/12/6 13:37
 */

@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class FinSysTenantUserParam {

    // 主键
    private Long id;

    // 属性列表
    private String userName;

    private String userCode;

    private String tenantId;

    private String createBy;

    private Long createTime;

    private String updateBy;

    private Long updateTime;

    private Integer sex;

    private Integer status;

    private Long seq;

    private String remark;

    private Long sysUserId;

    private Long sysDeptId;

    private String tenantCode;

    private String userPhone;

    private Integer isDelete;

    private Integer kfStatus;

    private String agentJid;

    private String workgroupJid;

    private String clientNumber;

    private String clientPwd;

    private Long supplierId;

    private String tenantName;

    private Integer lv;

    @JsonIgnore
    private String roleStr;

    private String avatar;

    private String email;

    @JsonIgnore
    private List<Long> roleList;

    private Boolean isOnline;

    private String parentCode;

    // 是否为运维商 如果有运维商id 则代表是，反之不是
    private String isSupplier;
}

 consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackParam.java

@@ -1,8 +1,11 @@
package com.consum.base.pojo.request;

import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
import lombok.NoArgsConstructor;

@@ -15,6 +18,7 @@
@NoArgsConstructor
@Data
@ApiModel
@JsonIgnoreProperties(ignoreUnknown = true)
public class UsingFormBackParam {

    @ApiModelProperty(value = "物品退回部门id")
@@ -36,10 +40,5 @@

    @ApiModelProperty(value = "分发物品信息")
    private List<UsingFormBackGoodsInfo> goods;






}

 consum-base/src/main/java/com/consum/base/pojo/response/FromProcureTemplateInfoVO.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java

@@ -1,6 +1,8 @@
package com.consum.base.pojo.response;

import java.util.List;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -12,15 +14,20 @@
@Data
public class GoodsModelVO {

    @ApiModelProperty(value = "id")
    private Long id;
    @ApiModelProperty(value = "型号名称")
    private String baseGoodsModelsName;
    @ApiModelProperty(value = "单位信息")
    private String unit;
    @ApiModelProperty(value = "单价")
    private Long price;
    @ApiModelProperty(value = "数量")
    private Integer counts;
    private Integer worehouseCount;
    private Long baseGoodsModelsId;
    @ApiModelProperty(value = "总金额")
    private Integer totalAmount;


    private String scrappedName;


 consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java

@@ -1,7 +1,13 @@
package com.consum.base.service;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.springframework.stereotype.Service;

import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.model.po.FinSysOrg;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.base.util.PlatformRSAUtils;
import com.iplatform.core.util.AESUtils;
@@ -10,46 +16,35 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;

@Service
public class FinSysTenantUserServiceImpl extends BaseServiceImpl {

    private static final String SQL_GET_USER = "SELECT * FROM fin_sys_tenant_user WHERE IS_DELETE = 0 AND `STATUS` = 1 AND TENANT_ID = ?";
    private static final String SQL_QH_PAGE_USER_PREFIX = "select fstu.* from FIN_SYS_TENANT_USER fstu where fstu.IS_DELETE = 0 ";
    private static final String SQL_QH_PAGE_USER_PREFIX_NEW = "select fstu.* from FIN_SYS_TENANT_USER fstu where IS_DELETE = 0 and status=1  ";
    private static final String SQL_TENANT_USER = "select fstu.*, fst.TENANT_NAME, fst.LV from FIN_SYS_TENANT_USER fstu\n"
        + "left join (SELECT CODE, NAME AS TENANT_NAME, LV FROM FIN_SYS_TENANT) fst ON fstu.TENANT_CODE = fst.CODE\n" + "where fstu.SYS_USER_ID = ?";
    private static final String SQL_TENANT_USER_BY_USER_ID = "select * from FIN_SYS_TENANT_USER where SYS_USER_ID = ? AND STATUS = 1";
    private static final String SQL_INSERT_ROLE_USER = "insert into s_role_user(user_id, role_id, org_id) values(?,?,0)";
    private static final String SQL_GET_USER =
        "SELECT * FROM fin_sys_tenant_user WHERE IS_DELETE = 0 AND `STATUS` = 1 AND TENANT_ID = ?";
    private static final String SQL_QH_PAGE_USER_PREFIX =
        "select fstu.* from FIN_SYS_TENANT_USER fstu where fstu.IS_DELETE = 0 ";

    private static final String SQL_TENANT_USER =
        "select fstu.*, fst.TENANT_NAME, fst.LV from FIN_SYS_TENANT_USER fstu\n"
            + "left join (SELECT CODE, NAME AS TENANT_NAME, LV FROM FIN_SYS_TENANT) fst ON fstu.TENANT_CODE = fst.CODE\n"
            + "where fstu.SYS_USER_ID = ?";

    private static final String SQL_INSERT_ROLE_USER =
        "insert into s_role_user(user_id, role_id, org_id) values(?,?,0)";

    private static final String SQL_DELETE_ROLE_USER = "DELETE FROM S_ROLE_USER WHERE USER_ID =?";

    /**
     * 根据用户id和角色id删除角色
     */
    private static final String SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID = "DELETE FROM S_ROLE_USER WHERE USER_ID =? AND role_id =?";
    private static final String SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID =
        "DELETE FROM S_ROLE_USER WHERE USER_ID =? AND role_id =?";

    private static final String SQL_SELECT_USER_CODE = "SELECT * FROM FIN_SYS_TENANT_USER  where  1 = 1 ";

    private static final String SQL_SELECT_USER_ID = "SELECT * FROM S_ROLE where 1=1 ";
    private static final String SQL_DEPT_ROLES = "select * from s_dept where  status=0 and del_flag=0";

    private static final String SQL_FIN_SYS_ORG = "SELECT * from FIN_SYS_ORG where ID=?";


    private static final String SQL_TENANT_KF_USER = "select fstu.*, sru.USER_ID from FIN_SYS_TENANT_USER fstu\n"
        + "left join (select USER_ID FROM S_ROLE_USER WHERE ROLE_ID = '1690961420053') sru ON fstu.SYS_USER_ID = sru.USER_ID\n"
        + "WHERE IS_DELETE = 0 AND STATUS = 1 AND sru.USER_ID is NOT NULL AND TENANT_CODE = ?";

    private static final String SQL_TEAM_KF_USER = "select fstu.*, sru.USER_ID,FST2.CODE as PARENT_Code from FIN_SYS_TENANT_USER fstu\n"
        + " left join (select USER_ID FROM S_ROLE_USER WHERE ROLE_ID = 2) sru ON fstu.SYS_USER_ID = sru.USER_ID\n"
        + " LEFT JOIN FIN_SYS_TENANT FST ON FST.CODE = fstu.TENANT_CODE \n" + " LEFT JOIN FIN_SYS_TENANT FST2 ON FST2.ID = FST.PARENT_ID \n"
        + "            WHERE IS_DELETE = 0 AND STATUS = 1 AND sru.USER_ID is NOT NULL AND fstu.ID != ?";

    /**
     * @Description 分页查询系统用户
@@ -75,19 +70,19 @@
            sql.append(" and USER_CODE like :USER_CODE");
            parameter.put("USER_CODE", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
        }
//        if(StringUtils.isNotEmpty(param.getUserCode())){
//            sql.append(" and user_code like :user_code");
//            parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
//        }
        // if(StringUtils.isNotEmpty(param.getUserCode())){
        // sql.append(" and user_code like :user_code");
        // parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
        // }
        if (param.getStatus() != null) {
            sql.append(" and status =:status");
            parameter.put("status", param.getStatus());
        }

//        if(param.getRoleId()!=null &&!param.getRoleId().equals("")){
//            sql.append(" and fstu.SYS_USER_ID  in  (select  user_id    from s_role_user where role_id = :role_id)");
//            parameter.put("role_id", param.getRoleId());
//        }
        // if(param.getRoleId()!=null &&!param.getRoleId().equals("")){
        // sql.append(" and fstu.SYS_USER_ID in (select user_id from s_role_user where role_id = :role_id)");
        // parameter.put("role_id", param.getRoleId());
        // }

        if (StringUtils.isNotEmpty(param.getUserPhone())) {
            sql.append(" and USER_PHONE =:userPhone");
@@ -103,13 +98,13 @@

        // 这里是选择人员加的
        if (param.getType() != null) {
            // 1 是财政用户  2 供应商  他俩的区别就是 供应商id是否为空
            // 1 是财政用户 2 供应商 他俩的区别就是 供应商id是否为空
            if (param.getType() == 1) {
                sql.append(" and  fstu.supplier_Id is  null  ");
            }

            if (param.getType() == 2) {
                //这里是 查的供应商   供应商id 已经在上面加过了
                // 这里是 查的供应商 供应商id 已经在上面加过了
            }
        }
        // 绑定CTI客服
@@ -118,68 +113,6 @@
                sql.append(" and fstu.AGENT_JID is not null ");
            } else {
                sql.append(" and fstu.AGENT_JID is null ");
            }
        }
        sql.append(" ORDER BY SEQ asc ,CREATE_TIME desc");
        return this.selectSplit(sql.toString(), parameter, new FinSysTenantUser());
    }


    /**
     * @Description 分页查询系统用户
     * @Author wh
     * @Date 2023/7/17 14:26
     */
    public GenericPager<FinSysTenantUser> queryAllPageUserNew(FinSysTenantUserSearchParam param) {
        Map<String, Object> parameter = new HashMap<>(5);
        StringBuilder sql = new StringBuilder(SQL_QH_PAGE_USER_PREFIX_NEW);
        if (param.getTenantCode() > 0) {
            sql.append(" and fstu.TENANT_CODE =:tenantCode");
            parameter.put("tenantCode", param.getTenantCode());
        }
        if (param.getSupplierId() != null) {
            sql.append(" and fstu.supplier_Id =:supplier_Id");
            parameter.put("supplier_Id", param.getSupplierId());
        }
        if (StringUtils.isNotEmpty(param.getUserName())) {
            sql.append(" and USER_NAME like :userName");
            parameter.put("userName", StringUtils.CHAR_PERCENT + param.getUserName() + StringUtils.CHAR_PERCENT);
        }
        if (StringUtils.isNotEmpty(param.getUserCode())) {
            sql.append(" and user_code like :user_code");
            parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
        }
        if (param.getStatus() != null) {
            sql.append(" and status like :status");
            parameter.put("status", param.getStatus());
        }

        if (param.getRoleId() != null && !param.getRoleId().equals("")) {
            sql.append(" and fstu.SYS_USER_ID  in  (select  user_id    from s_role_user where role_id = :role_id)");
            parameter.put("role_id", param.getRoleId());
        }

        if (StringUtils.isNotEmpty(param.getUserPhone())) {
            sql.append(" and USER_PHONE =:userPhone");
            try {
                // 加密手机号
                String key = PlatformRSAUtils.AES_KEY;
                parameter.put("userPhone", AESUtils.encryptStrAES(param.getUserPhone(), key));
            } catch (Exception e) {
                log.error("手机号加密失败， 原因是：" + e.getMessage());
                parameter.put("userPhone", "");
            }
        }

        // 这里是选择人员加的
        if (param.getType() != null) {
            // 1 是财政用户  2 供应商  他俩的区别就是 供应商id是否为空
            if (param.getType() == 1) {
                sql.append(" and  fstu.supplier_Id is  null  ");
            }

            if (param.getType() == 2) {
                //这里是 查的供应商   供应商id 已经在上面加过了
            }
        }
        sql.append(" ORDER BY SEQ asc ,CREATE_TIME desc");
@@ -197,7 +130,8 @@
    }

    public FinSysTenantUser queryOneByUserId(String userId) {
        List<FinSysTenantUser> finSysTenantUserList = this.select(SQL_TENANT_USER, new Object[]{userId}, new FinSysTenantUser());
        List<FinSysTenantUser> finSysTenantUserList =
            this.select(SQL_TENANT_USER, new Object[] {userId}, new FinSysTenantUser());
        if (finSysTenantUserList.size() > 0) {
            return finSysTenantUserList.get(0);
        } else {
@@ -268,7 +202,6 @@
        this.execBatchUpdate(SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID, parameters);
    }


    /**
     * 根据userCode查询重复。
     *
@@ -326,91 +259,11 @@
    }

    /**
     * @Description 获取客服
     * @Author wh
     * @Date 2023/7/19 10:12
     */
    public List<FinSysTenantUser> selectKF(String tenantCode) {
        // 查询角色为客服且机构和当前请求用户一致的
        return this.select(SQL_TENANT_KF_USER, new Object[]{tenantCode}, new FinSysTenantUser());
    }
//    public FinSysTenantUser selectKF(String tenantCode) {
//        // 查询角色为客服且机构和当前请求用户一致的
//        List<FinSysTenantUser> finSysTenantUserList = this.select(SQL_TENANT_KF_USER, new Object[]{tenantCode}, new FinSysTenantUser());
//        if (finSysTenantUserList.size() > 0) {
//            return finSysTenantUserList.get(0);
//        } else {
//            return null;
//        }
//    }

    /**
     * @Description 获取所有客服信息，不包含自己
     * @Author wh
     * @Date 2023/7/20 15:33
     */
    public List<FinSysTenantUser> selectTeamKF(Long id) {
        // 查询角色为客服且机构和当前请求用户一致的
        List<FinSysTenantUser> finSysTenantUserList = this.select(SQL_TEAM_KF_USER, new Object[]{id}, new FinSysTenantUser());
        return finSysTenantUserList;
    }

    /**
     * 根据机构id查询机构
     *
     * @param orgId
     * @return
     */
    public List<FinSysOrg> selectFinSysOrg(String orgId) {
        List<FinSysOrg> select = this.select(SQL_FIN_SYS_ORG, new Object[]{orgId}, new FinSysOrg());
        return select;
    }

    public FinSysTenantUser queryBySysUserId(Long userId) {
        List<FinSysTenantUser> select = this.select(SQL_TENANT_USER_BY_USER_ID, new Object[]{userId}, new FinSysTenantUser());
        if (StringUtils.isEmptyList(select)) {
            return null;
        } else {
            return select.get(0);
        }
    }

    private static final String SQL_GET_ALL_USER = "select DISTINCT( fstu.sys_user_id), fstu.USER_NAME as USER_Name, fstu.id as Id from (\n"
        + "SELECT DISTINCT(CREATE_BY), EVENT_MANAGE_ID FROM FIN_EVENT_MANAGE_RECORD) femr LEFT JOIN FIN_SYS_TENANT_USER fstu ON femr.CREATE_BY = fstu.ID\n"
        + "LEFT JOIN FIN_EVENT_MANAGE fem ON fem.id = femr.EVENT_MANAGE_ID WHERE USER_NAME is not NULL ";

    /**
     * @Description 查询数据统计的信息
     * @Author wh
     * @Date 2023/9/5 11:53
     */
    public List<FinSysTenantUser> getStatics(FinSysTenantUserSearchParam finSysTenantUserSearchParam) {
        Map<String, Object> parameters = new HashMap<>(10);
        StringBuilder sql = new StringBuilder(SQL_GET_ALL_USER);
        sql.append(" and fem.PROJECT_ID = :projectId");
        parameters.put("projectId", finSysTenantUserSearchParam.getProjectId());
        if (StringUtils.isNotEmpty(finSysTenantUserSearchParam.getUserName())) {
            sql.append(" and fstu.USER_NAME like :userName");
            parameters.put("userName", StringUtils.CHAR_PERCENT + finSysTenantUserSearchParam.getUserName() + StringUtils.CHAR_PERCENT);
        }
        if (finSysTenantUserSearchParam.getStartTime() != null && finSysTenantUserSearchParam.getStartTime() > 0) {
            sql.append(" and fem.create_time >= :startTime");
            parameters.put("startTime", finSysTenantUserSearchParam.getStartTime());
        }
        if (finSysTenantUserSearchParam.getEndTime() != null && finSysTenantUserSearchParam.getEndTime() > 0) {
            sql.append(" and fem.create_time <= :endTime");
            parameters.put("endTime", finSysTenantUserSearchParam.getEndTime());
        }
        sql.append(" ORDER BY ID DESC");
        return this.select(sql.toString(), parameters, new FinSysTenantUser());
    }

    /**
     * @Description 根据OrgId获取用户信息
     * @Author wh
     * @Date 2023/10/4 15:49
     */
    public List<FinSysTenantUser> getByOrgId(Long orgId) {
        return this.select(SQL_GET_USER, new Object[]{orgId}, new FinSysTenantUser());
        return this.select(SQL_GET_USER, new Object[] {orgId}, new FinSysTenantUser());
    }
}

 consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java

@@ -1,5 +1,6 @@
package com.consum.base.service;

import com.consum.base.pojo.dto.GoodModelInfoDTO;
import java.util.List;
import java.util.Map;

@@ -31,4 +32,12 @@
     * @return
     */
    List<GoodsTemplateCountVO> getProcureCountByBusinessId(Long businessId);

    /**
     * 根据业务id查询型号信息列表
     *
     * @param businessId
     * @return
     */
    List<GoodModelInfoDTO> getGoodsModelListByBusinessId(Long businessId);
}

 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java

File was renamed from consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
@@ -1,4 +1,4 @@
package com.consum.base.service;
package com.consum.base.service.impl;

import java.util.ArrayList;
import java.util.HashMap;
@@ -17,6 +17,15 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhFormProcureGoodsService;
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;

 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java

@@ -2,7 +2,6 @@

import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.LWhFormInventoryCoreService;
import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.base.service.LWhGoodsService;

 consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java

File was renamed from consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -1,6 +1,5 @@
package com.consum.base.service;
package com.consum.base.service.impl;

import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -18,6 +17,12 @@
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormOutput;
import com.consum.model.po.LWhFormTransfer;

 consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java

@@ -28,7 +28,6 @@
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.service.BaseGoodsModelsService;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormOutputCoreService;
import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;

 consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java

File was renamed from consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
@@ -1,5 +1,8 @@
package com.consum.base.service;
package com.consum.base.service.impl;

import com.consum.base.service.LWarehouseFlowCoreService;
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhProcureModelService;
import java.util.List;
import java.util.stream.Collectors;


 consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java

@@ -4,7 +4,6 @@
import com.consum.base.service.LGoodsUserRecordServiceImpl;
import com.consum.base.service.LGoodsWhRecordServiceImpl;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.service.LWhFormOutputCoreService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;

 consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelServiceImpl.java

@@ -10,6 +10,7 @@
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.dto.GoodModelInfoDTO;
import com.consum.base.pojo.response.GoodsTemplateCountVO;
import com.consum.base.service.LWhProcureModelService;
import com.consum.model.po.LWhProcureModel;
@@ -137,4 +138,23 @@
        }
        return goodsTemplateCount;
    }

    @Override
    public List<GoodModelInfoDTO> getGoodsModelListByBusinessId(Long businessId) {
        // 查询型号列表信息
        List<GoodModelInfoDTO> goodsModelList = Lists.newArrayList();
        String sql =
            "SELECT bgt.id baseGoodsTemplateId,pm.id,CATEGORY_ID,CATEGORY_NAME,GOODS_NAME baseGoodsName,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
                + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
                + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
                + "WHERE pm.BUSINESS_ID = :businessId";
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("businessId", businessId);
        List<Map<String, Object>> modelList = select(sql, paramMap, new MapperUtil());
        modelList.forEach(item -> {
            GoodModelInfoDTO goodsModelVO = MapUtils.convertMapToObj(item, GoodModelInfoDTO.class);
            goodsModelList.add(goodsModelVO);
        });
        return goodsModelList;
    }
}

 consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java

@@ -1,17 +1,19 @@

package com.consum.model.po;

import java.util.List;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.walker.jdbc.BasePo;

import java.util.List;

/**
 * 表名:FIN_SYS_TENANT_USER *
 *
 * @author genrator
 */
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class FinSysTenantUser extends BasePo<FinSysTenantUser> {
    // 序列化版本号
@@ -107,7 +109,7 @@
    @JsonIgnore
    protected boolean isset_clientPwd = false;

    private Long  supplierId = null;
    private Long supplierId = null;

    @JsonIgnore
    protected boolean isset_supplierId = false;
@@ -127,9 +129,11 @@
    private String avatar = null;
    @JsonIgnore
    protected boolean isset_avatar = false;

    public String getAvatar() {
        return avatar;
    }

    private String email = null;
    @JsonIgnore
    protected boolean isset_email = false;
@@ -154,12 +158,10 @@

    public void setSupplierId(Long supplierId) {
        this.supplierId = supplierId;
        this.isset_supplierId=true;
        this.isset_supplierId = true;
    }

    private List<Long> roleList = null;



    public List<Long> getRoleList() {
        return roleList;
@@ -177,7 +179,7 @@
    @JsonIgnore
    protected boolean isset_parentCode = false;

    private String isSupplier; //是否为运维商   如果有运维商id  则代表是，反之不是
    private String isSupplier; // 是否为运维商 如果有运维商id 则代表是，反之不是

    public String getIsSupplier() {
        return isSupplier;
@@ -190,8 +192,7 @@
    /**
     * 默认构造函数
     */
    public FinSysTenantUser() {
    }
    public FinSysTenantUser() {}

    /**
     * 根据主键构造对象
@@ -214,7 +215,7 @@
     */
    @Override
    public void setPkValue(Object value) {
        this.setId((Long) value);
        this.setId((Long)value);
    }

    public Long getId() {
@@ -566,14 +567,11 @@
        this.isset_parentCode = true;
    }



    //roleStr
    // roleStr
    @JsonIgnore
    public boolean isEmptRoleStr() {
        return this.roleStr == null;
    }


    public String getRoleStr() {
        return this.roleStr;
@@ -584,51 +582,31 @@
        this.isset_roleStr = true;
    }



    @JsonIgnore
    public boolean isEmptLv() {
        return this.lv == null;
    }


    /**
     * 重写 toString() 方法
     */
    @Override
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("userName=").append(this.userName)
                .append("userCode=").append(this.userCode)
                .append("tenantId=").append(this.tenantId)
                .append("createBy=").append(this.createBy)
                .append("createTime=").append(this.createTime)
                .append("updateBy=").append(this.updateBy)
                .append("updateTime=").append(this.updateTime)
                .append("sex=").append(this.sex)
                .append("status=").append(this.status)
                .append("seq=").append(this.seq)
                .append("remark=").append(this.remark)
                .append("sysUserId=").append(this.sysUserId)
                .append("sysDeptId=").append(this.sysDeptId)
                .append("tenantCode=").append(this.tenantCode)
                .append("userPhone=").append(this.userPhone)
                .append("isDelete=").append(this.isDelete)
                .append("kfStatus=").append(this.kfStatus)
                .append("agentJid=").append(this.agentJid)
                .append("workgroupJid=").append(this.workgroupJid)
                .append("clientNumber=").append(this.clientNumber)
                .append("clientPwd=").append(this.clientPwd)
                .append("tenantName=").append(this.tenantName)
                .append("lv=").append(this.lv)
                .append("isOnline=").append(this.isOnline)
                .append("parentCode=").append(this.parentCode)
                .append("supplierId=").append(this.supplierId)
                .append("roleStr=").append(this.roleStr)
        return new StringBuilder().append("id=").append(this.id).append("userName=").append(this.userName)
            .append("userCode=").append(this.userCode).append("tenantId=").append(this.tenantId).append("createBy=")
            .append(this.createBy).append("createTime=").append(this.createTime).append("updateBy=")
            .append(this.updateBy).append("updateTime=").append(this.updateTime).append("sex=").append(this.sex)
            .append("status=").append(this.status).append("seq=").append(this.seq).append("remark=").append(this.remark)
            .append("sysUserId=").append(this.sysUserId).append("sysDeptId=").append(this.sysDeptId)
            .append("tenantCode=").append(this.tenantCode).append("userPhone=").append(this.userPhone)
            .append("isDelete=").append(this.isDelete).append("kfStatus=").append(this.kfStatus).append("agentJid=")
            .append(this.agentJid).append("workgroupJid=").append(this.workgroupJid).append("clientNumber=")
            .append(this.clientNumber).append("clientPwd=").append(this.clientPwd).append("tenantName=")
            .append(this.tenantName).append("lv=").append(this.lv).append("isOnline=").append(this.isOnline)
            .append("parentCode=").append(this.parentCode).append("supplierId=").append(this.supplierId)
            .append("roleStr=").append(this.roleStr)


                .toString();
            .toString();
    }

    /**
@@ -638,7 +616,7 @@
        FinSysTenantUser fin_sys_tenant_user = new FinSysTenantUser();

        // 数据库名称
        //fin_sys_tenant_user.setDatabaseName_(this.getDatabaseName_());
        // fin_sys_tenant_user.setDatabaseName_(this.getDatabaseName_());

        // 主键
        if (this.isset_id) {
@@ -732,9 +710,6 @@
        if (this.isset_roleStr) {
            fin_sys_tenant_user.setRoleStr(this.getRoleStr());
        }




        return fin_sys_tenant_user;
    }